Skip to content

Q
qtbase
Switch branch/tag
  1. 25 Jul, 2018 1 commit
  3. 14 Jun, 2018 1 commit
  5. 05 Jun, 2018 19 commits
  7. 04 Apr, 2018 1 commit
  9. 20 Mar, 2018 2 commits
  11. 14 Mar, 2018 1 commit
  13. 12 Mar, 2018 1 commit
  15. 09 Mar, 2018 1 commit
    • David Faure's avatar
      QHeaderView: fix inconsistent saved state, ignored during restore · 4c0a363a
      David Faure authored 
      This happens because QTreeView disconnects QHeaderView's
_q_layoutChanged slot (!). So the stretching of the last section,
done in _q_layoutAboutToBeChanged, invalidated total length, but didn't
recalculate it (since that's done in _q_layoutChanged). As a result,
length was inconsistent, and saveState would save that, and
restoreState() would early-return, not doing anything.

Let's just ensure length is always consistent, so we don't depend on the
complex issue of whether _q_layoutChanged should be called or not.

This an adapted backport of 4a04eea4f4 from 5.11, the unittest shows that
c0e45ae851 is missing in this branch though.

Change-Id: I4137a19e0a6fdf820dd53fb55e858d1d04a2c113
Reviewed-by: default avatarThorbjørn Lund Martsum <tmartsum@gmail.com>
      4c0a363a
  17. 05 Mar, 2018 1 commit
  19. 02 Mar, 2018 2 commits
  21. 01 Mar, 2018 1 commit
  23. 28 Feb, 2018 1 commit
  25. 27 Feb, 2018 2 commits
    • Alexander Shevchenko's avatar
      unify windows mkspecs: define c++ flags explicitly · 196318d0
      Alexander Shevchenko authored 
      with 40e87491 merged, 'QMAKE_CXXFLAGS' variable in
'win32-g++' toolchain became defined via 'QMAKE_CFLAGS'.
the similar can be found in 'win32-clang-msvc' and
'win32-icc' toolchains too.

this works for now, because such definitions just duplicates code
from includes, like 'gcc-base.conf', 'msvc-desktop.conf', etc.
but it would became broken, if changes would be applied to
'QMAKE_CXXFLAGS' definitions in that includes, prior
to the redefinitions in 'win32-*/qmake.conf' toolchains.

thus 'QMAKE_CXXFLAGS' definitions in 'win32-*/qmake.conf' toolchains
should not depend on 'QMAKE_CFLAGS' and be done explicitly.

in order to apply this change correctly to 'win32-icc' toolchain,
its 'QMAKE_CFLAGS' variable should become dependent on definitions
in the includes, similar to 'win32-clang-msvc' and
'win32-msvc' toolchains.

Change-Id: I5e820e44a769a590ba63f70dcb3a115311093311
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@qt.io>
(cherry picked from commit 7ff3032b22cacd38390d164cb2c1a232c1979bab)
      196318d0
    • Jani Heikkinen's avatar
      Bump copyright year · 5778fff7
      Jani Heikkinen authored 
      Task-number: QTBUG-65810
Change-Id: Ib6f87a126f64c2e4b2e924b97af4c2b2d10dd29e
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 89053e224f296a19c107ea7925539d5125dac5c0)
      5778fff7
  27. 26 Feb, 2018 2 commits
  29. 22 Feb, 2018 4 commits
    • Alexander Volkov's avatar
      fix installation of resources for example sources · 1c1ec433
      Alexander Volkov authored 
      contains() interprets the regexp as being implicitly
anchored, so the leading part of the path needs to be
explicitly matched.

Change-Id: I1efa07dc99bb2db1717d2a66621899e23c144164
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@qt.io>
(cherry picked from commit 22d3eeebb0a011a61104de2eb635a3ecf26b58e2)
      1c1ec433
    • Christian Ehrlicher's avatar
      QHeaderView: Preserve settings on layoutChange with empty model · c213dfac
      Christian Ehrlicher authored 
      Do not clear the settings of QHeaderView during layoutChange when the
model is empty and the section count did not change. This will not work
when a section is moved or a section is replaced with a new one during
layoutChange. But since layoutChanged is also called on sorting, this
patch ensures that the settings are not cleared in this case.
This restores the behavior to the same as before 5.9.4.

Task-number: QTBUG-66444
Task-number: QTBUG-65478
Change-Id: I39989cfd45b42e58f49d18ec014d3a941cadb6c9
Reviewed-by: default avatarThorbjørn Lund Martsum <tmartsum@gmail.com>
(cherry picked from commit 9395f35cb18725995910531ca8b09f1d84efa96c)
      c213dfac
    • Christian Ehrlicher's avatar
      QHeaderView: properly restore hidden section size on layoutChanged() · 2551e96d
      Christian Ehrlicher authored 
      During (re)storing the sections within layoutChanged handling, the
hidden section size was not properly stored which lead to a section
size of 0 when the section was unhided afterwards.

Task-number: QTBUG-66413
Task-number: QTBUG-65478
Change-Id: I0b714c7e0530a1eae82b3bb0e0dc80ed576522d0
Reviewed-by: default avatarThorbjørn Lund Martsum <tmartsum@gmail.com>
(cherry picked from commit c0e45ae851c96dfebdebfd1e85b7b7eee6540bd1)
      2551e96d
    • Antonio Larrosa's avatar
      opengl: Bail if cached shader fails to load · ef20989b
      Antonio Larrosa authored 
      QOpenGLProgramBinaryCache::setProgramBinary() should check
GL_LINK_STATUS after glProgramBinary(), but doesn't.

In practice, this means that SDDM is a white screen, and KDE is just
a gray task bar.

So far, Qt tries to check this using its internal ::link() function.
But in case the cached binary fails to load, Qt currently attempts to
link the inexistent program, resulting in a zero-length, fixed
pipeline shader.

Checking this already in ::setProgramBinary() makes the call to
::link() superfluous, so we remove that as well.

Done-with: Max Staudt <mstaudt@suse.com>
Done-with: Michal Srb <msrb@suse.com>
Done-with: Fabian Vogt <fvogt@suse.de>
Task-number: QTBUG-66420
Change-Id: Iabb51d0eb2c0c16bde696efff623e57d15f28d82
Reviewed-by: default avatarJesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: default avatarLaszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit fa091640134b3ff99a9eb92df8286d15203122bf)
      ef20989b