summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'fcda1b785bd7d86011f49bfe96cb22b04202933f' into qt-master-from-4.7Olivier Goffart2010-10-254-232/+352
|\
| * QGraphicsLayoutItem - user set sizes should always override, even if there's ...John Tapsell2010-10-133-166/+188
| * QGridLayoutEngine - Rework height-for-width support so that row/col spanning ...John Tapsell2010-10-133-191/+157
* | Merge commit '9f766c977a329c84023a15fc66f52d26ff03447b' into qt-master-from-4.7Olivier Goffart2010-10-250-0/+0
|\ \ | |/
| * Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""Olivier Goffart2010-10-135-17/+678
* | Merge commit '9f766c977a329c84023a15fc66f52d26ff03447b^' into qt-master-from-4.7Olivier Goffart2010-10-2512-36/+242
|\ \ | |/
| * Adjust the parent index for the itemsMoved call.Stephen Kelly2010-10-133-4/+17
| * Correctly handle both 16bit and 32bit live pixmaps in meego graphics system.Michael Dominic K2010-10-135-12/+20
| * Correctly remove the egl alpha surface flags in meego graphics system.Michael Dominic K2010-10-131-1/+3
| * Proper dither & proper alpha checking.Michael Dominic K2010-10-131-4/+4
| * In meego graphics system, use always 16bit textures.Michael Dominic K2010-10-131-8/+40
| * QCompleter: do not auto complete when directory is changed.Olivier Goffart2010-10-133-6/+87
| * tst_qcompleter: Add a test for QFileSystemModelOlivier Goffart2010-10-131-6/+76
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-10-222-3/+35
|\ \
| * | Symbian shared memory could not be distinguished by numeric keymread2010-10-222-3/+35
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-2216-13/+489
|\ \ \
| * | | Fix compiler warnings in qelfparserArvid Ephraim Picciani2010-10-222-3/+4
| * | | uic: Add autotests for layout alignmentFriedemann Kleint2010-10-222-0/+132
| * | | Designer: Support alignment in box and grid layouts.Friedemann Kleint2010-10-2212-10/+353
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-2226-25/+415
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed a newly added autotest for QGraphicsView hover_leave.Denis Dzyubenko2010-10-221-1/+1
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-2126-25/+415
| |\ \ \ |/ / / /
| * | | Fix linux-clang license headerTor Arne Vestbø2010-10-211-19/+19
| * | | Add mkspecs for Clang on Linux and Mac OS XTor Arne Vestbø2010-10-207-0/+291
| * | | Handle Objective-C/C++ sources in SOURCES gracefullyTor Arne Vestbø2010-10-203-12/+20
| * | | configure: Don't use character class when looking for QMAKE_CONF_COMPILERTor Arne Vestbø2010-10-201-1/+1
| * | | removed shlobj.h to prevent different redefinitions for Windows Embedded 7Oliver Gutbrod2010-10-201-1/+0
| * | | enums are defined as typedefs for Windows Embedded 7Oliver Gutbrod2010-10-201-0/+3
| * | | windef.h needs to be include before types.h for Windows Embedded 7Oliver Gutbrod2010-10-202-0/+5
| * | | defines GID_* for Windows Embedded 7Oliver Gutbrod2010-10-201-1/+14
| * | | WM_GESTURE and WM_GESTURENOTIFY are not defined together for Windows Embedded 7Oliver Gutbrod2010-10-201-0/+2
| * | | SPI_GETPLATFORMTYPE not defined for Windows Embedded 7Oliver Gutbrod2010-10-202-0/+7
| * | | Make QCompleter return current parent instead of invalid indexZeno Albisser2010-10-201-1/+1
| * | | make QFileDialog completer return proper dirnames in rootZeno Albisser2010-10-201-1/+4
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-10-196-9/+68
| |\ \ \
| | * | | Make sure QGraphicsSceneHoverLeave event has non-null widget pointer.Denis Dzyubenko2010-10-195-8/+67
| | * | | Designer: Enable morphing into QTextBrowser.Friedemann Kleint2010-10-191-1/+1
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-2116-13/+298
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Fix compilation with QT_NO_KEYWORDSOlivier Goffart2010-10-211-1/+1
| * | | Replaced sample text for Japanese fontTasuku Suzuki2010-10-201-4/+6
| * | | Fix the #ifdef position.Fabien Freling2010-10-203-4/+7
| * | | Deactivate the auto-test on problematic platforms.Alexis Menard2010-10-201-0/+3
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-1914-9/+286
| |\ \ \ |/ / / /
| * | | Enable the unified toolbar with the rasterFabien Freling2010-10-196-4/+20
| * | | configure: Don't use character class when looking for QMAKE_CONF_COMPILERTor Arne Vestbø2010-10-191-1/+1
| * | | Moving the resetInternalData slot to QAbstractProxyModelGabriel de Dietrich2010-10-194-26/+26
| * | | Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2010-10-194-0/+198
| * | | Emit beginResetModel before updating the strings.Stephen Kelly2010-10-191-1/+2
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-192-2/+64
| |\ \ \
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-182-2/+64
| | |\ \ \