summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-08-238-17/+60
|\
| * Merge branch '4.8-upstream' into master-waterWater-Team2011-08-183-7/+9
| |\
| * \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-171-2/+2
| |\ \
| * | | Add a QApplication::queryKeyboardModifiers() method.David Faure2011-08-178-17/+60
* | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-191-3/+23
|\ \ \ \
| * \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-181-3/+23
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-181-2/+5
| | |\ \ \ \
| | | * | | | Compile fix for Symbian 5th and earlierSami Merila2011-08-181-2/+5
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-171-1/+18
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Symbian: Fix backspace on empty lines of multiline texteditsMiikka Heikkinen2011-08-171-1/+18
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-198-17/+53
|\ \ \ \ \ \ \
| * | | | | | | Doc: Fixed qdoc warnings.David Boddie2011-08-158-17/+53
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-181-2/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-164-3/+15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-08-1613-24/+48
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix bidi reordering of RTL text with embedded imagesEskil Abrahamsen Blomfeldt2011-08-161-2/+0
* | | | | | | | | | Merge remote-tracking branch 'review/master'Sergio Ahumada2011-08-181-1/+1
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix files that don't end with a newline characterSergio Ahumada2011-08-121-1/+1
* | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-182-6/+8
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-172-6/+8
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-171-3/+5
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | Handle CloseSoftwareInputPanel event in QCoeFepInputContextSami Merila2011-08-171-3/+5
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-08-171-3/+3
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix delayed password masking mid-string.Andrew den Exter2011-08-171-3/+3
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-08-173-54/+87
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-165-20/+40
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-159-13/+37
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Fix a crash in a11y introduced by d289e54f2d2aa066cb3Jan-Arve Saether2011-08-151-41/+72
| * | | | | | | | | | | Fix bug QTBUG-13901, Mac style button rectChris Meyer2011-08-121-1/+1
| * | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-112-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Cocoa: change usage of deprecated API (scrolling) in LionRichard Moe Gustavsen2011-08-101-12/+14
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-161-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | / / / / / / / | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-161-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-161-2/+2
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Disabled splitscreen translation still moves screenSami Merila2011-08-161-2/+2
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-161-17/+25
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Minor optimizations for QTextEngineRitt Konstantin2011-08-081-17/+25
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-164-3/+15
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-151-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Join user state of removed text blocksLeandro Melo2011-08-151-0/+1
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-08-121-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Missed break of switch-case addedViktor Kolesnyk2011-08-121-0/+1
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-122-3/+24
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix softkeys cleanupMiikka Heikkinen2011-08-121-2/+12
| | * | | | | | Fix clientRect usage in QWidgetPrivate::setGeometry_sys()Miikka Heikkinen2011-08-111-1/+1
| | * | | | | | Do not allow fullscreen/maximized windows to expand beyond client rectMiikka Heikkinen2011-08-111-7/+9
| | * | | | | | Do not modify window size for fullscreen windows in setGeometry_sysMiikka Heikkinen2011-08-111-1/+10
* | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-159-13/+37
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-058-12/+32
| |\ \ \ \ \ \ | | |/ / / / /