summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Revert "QWorkspace: fix hardcoded min size overwriting the real min size"Olivier Goffart2010-10-161-9/+6
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1512-62/+368
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1512-62/+368
| |\
| | * Disable the unified toolbar before enteringFabien Freling2010-10-153-2/+37
| | * QWorkspace: fix hardcoded min size overwriting the real min sizeDavid Faure2010-10-151-6/+9
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-1418-95/+368
| | |\
| | | * Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-1412-52/+81
| | | |\
| | | | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-136-38/+60
| | | | |\
| | | | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-121-3/+5
| | | | |\ \
| | | | * | | Moved the property documentation to its proper location.Jerome Pasion2010-10-111-0/+16
| | | | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-096-11/+36
| | | | |\ \ \
| | | | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-089-61/+107
| | | | |\ \ \ \
| | | | * | | | | Made several QMenuBar functions visible to qdoc and added documentation.Jerome Pasion2010-10-081-11/+19
| | | | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0712-66/+107
| | | | |\ \ \ \ \
| | | * | \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-136-43/+287
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | | * | | | | | QGraphicsLayoutItem - user set sizes should always override, even if there's ...John Tapsell2010-10-132-10/+11
| | | | * | | | | | QGridLayoutEngine - Rework height-for-width support so that row/col spanning ...John Tapsell2010-10-132-191/+122
| | | | * | | | | | Revert "Revert "Fix (implement!) hfw/wfh in QGridLayoutEngine""Olivier Goffart2010-10-134-13/+318
| | | | * | | | | | QCompleter: do not auto complete when directory is changed.Olivier Goffart2010-10-132-6/+13
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-151-14/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Cocoa: small update to 534ba3c7314820604ba5aeeffa6051c91e7c1d09Richard Moe Gustavsen2010-10-151-5/+8
| * | | | | | | | | | Cocoa: fix child window issues (QTBUG 13867, 14420, 13126)Richard Moe Gustavsen2010-10-151-14/+33
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-158-1039/+356
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Implemented Qt::WA_ShowWithoutActivating for Symbian.Janne Anttila2010-10-151-1/+1
| * | | | | | | | | Clean up ARM SIMD drawhelper code and make sure it works.Jani Hautakangas2010-10-157-1038/+355
| |/ / / / / / / /
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1412-45/+47
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1312-45/+47
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1312-45/+47
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1212-45/+47
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-1212-45/+47
| | | | |\ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | | | * | | | | Add TIFFClose to QTIffHandler::option() to avoid memory leakTopi Reiniƶ2010-10-111-0/+1
| | | | | * | | | | [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel ...Carlos Manuel Duclos Vergara2010-10-111-4/+0
| | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0910-41/+46
| | | | | |\ \ \ \ \ | | | | | | |_|_|_|/ | | | | | |/| | | |
| | | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0910-41/+46
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0810-41/+46
| | | | | | | |\ \ \ \ | | | | | | | | |_|_|/ | | | | | | | |/| | |
| | | | | | | | * | | Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-072-1/+6
| | | | | | | | |\ \ \ | | | | | | | | | |/ /
| | | | | | | | | * | Doc: adding note to function QWSKeyboardHandler::processKeycode - that it wa...Morten Engvoldsen2010-10-071-0/+2
| | | | | | | | | * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-061-7/+2
| | | | | | | | | |\ \
| | | | | | | | | * \ \ Merge branch '13092010doc' into 4.7Jerome Pasion2010-10-061-1/+4
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ Merge branch '13092010doc' of scm.dev.nokia.troll.no:qt/qt-doc-team into 1309...Jerome Pasion2010-09-1658-380/+617
| | | | | | | | | | |\ \ \
| | | | | | | | | | * | | | Added statement regarding validators and input masks on the same line edit.Jerome Pasion2010-09-141-1/+4
| | | | | | | | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-079-55/+67
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |_|_|_|/ | | | | | | | | | |/| | | |
| | | | | | | | * | | | | | Merge commit 'doc-team/4.7' into 4.7Morten Engvoldsen2010-10-068-40/+40
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / | | | | | | | | | |/| | | |
| | | | | | | | | * | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0425-455/+149
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-0416-33/+112
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | * | | | | | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-047-35/+35
| | | | | | | | | * | | | | | | Doc: Made a number of fixes to the documentation.David Boddie2010-10-041-5/+5
| | | | | | | | | * | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-272-15/+4
| | | | | | | | | |\ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | Giving Qt a default app server when Avkon is removedmread2010-10-141-0/+7
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-132-7/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |