summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-203-10/+32
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-201-2/+19
| |\
| | * Fixed font rendering in manually built Qt on ARMv6.Samuel Rødal2010-10-201-2/+19
| * | Fix autotest failure with experimental client decoHarald Fernengel2010-10-201-1/+1
| |/
| * Further focus scope fixes.Michael Brasser2010-10-191-7/+12
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-2022-1103/+724
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-181-0/+2
| |\
| | * QS60Style: ComboBox disappears after orientation switchSami Merila2010-10-181-0/+2
| * | Fixed QGraphicsItem to send ItemScenePositionHasChanged when appropriateJ-P Nurmi2010-10-181-1/+5
| |/
| * 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' 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
| | | | | | | | | |\ \
| | | | | | | | | * \ \ 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' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-151-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-141-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | 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-doc-team into 4.7David Boddie2010-10-1422-113/+224
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-136-38/+60
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-132-7/+11
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-122-7/+11
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-122-7/+11
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | Don't give focus to a FocusScope that has had focus explicitly cleared.Michael Brasser2010-10-112-7/+11
| | | | | |/ / / / / / /
| | * | | | | | | | | | Remove obsolete tweak in QFontEngineS60::alphaMapForGlyphAlessandro Portale2010-10-121-17/+5
| | |/ / / / / / / / /