diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-14 09:56:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-14 09:56:18 (GMT) |
| commit | 305a764f1db228a49a94a86fabbb5d6b3aa3f8c4 (patch) | |
| tree | 129256ad69e8bfb2b2914ad4b87c6fde3b01324d /src/corelib/kernel/qvariant.h | |
| parent | 235d1d687dcc2d21860cd753c9d67964c5270be2 (diff) | |
| parent | f3180713921f73ea529b22379ce5f87392ce749a (diff) | |
| download | Qt-305a764f1db228a49a94a86fabbb5d6b3aa3f8c4.zip Qt-305a764f1db228a49a94a86fabbb5d6b3aa3f8c4.tar.gz Qt-305a764f1db228a49a94a86fabbb5d6b3aa3f8c4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_qcompleter.cpp: fix test on mac.
Fixed autotest that was missing focus on Windows
QGraphicsLayoutItem - user set sizes should always override, even if there's a constraint
QGridLayoutEngine - Rework height-for-width support so that row/col spanning works
Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""
Adjust the parent index for the itemsMoved call.
Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.
Correctly remove the egl alpha surface flags in meego graphics system.
Proper dither & proper alpha checking.
In meego graphics system, use always 16bit textures.
QCompleter: do not auto complete when directory is changed.
tst_qcompleter: Add a test for QFileSystemModel
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
0 files changed, 0 insertions, 0 deletions