summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-09-201-21/+1
|\
| * Cleanup qwidget_s60.cppMiikka Heikkinen2011-09-141-21/+1
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-09-101-1/+1
|\ \
| * \ Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-0810-21/+109
| |\ \ | | |/
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-08-301-1/+1
| |\ \
| | * | QPA event loop: Set a timeout != 0 if there are no timers.Eike Ziller2011-08-291-1/+1
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-081-8/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Replace explicit surrogate handlers by inline methods of QChar classsuzuki toshiya2011-09-071-8/+8
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-071-1/+1
|\ \ \ \ | |/ / /
| * | | Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-061-1/+1
| |/ /
* | | Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-011-2/+1
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-311-2/+1
| |\ \ \
| | * \ \ Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-3016-78/+84
| | |\ \ \ | | | |/ /
| | * | | Doc: Fix doc bug in QMouseEventGeir Vattekar2011-08-221-2/+1
* | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-09-014-9/+14
|\ \ \ \ \
| * \ \ \ \ Merge branch 'qt-4.7' into 4.7Liang Qi2011-08-315-5/+55
| |\ \ \ \ \
| * | | | | | Prevent leakage of native window handlesGareth Stockwell2011-08-314-9/+14
* | | | | | | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-3110-33/+112
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-08-312-4/+38
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix pointer event mapping when windows are fixed to native orientationLaszlo Agocs2011-08-292-4/+38
| * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-275-55/+5
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Add a QApplication::queryKeyboardModifiers() method.David Faure2011-08-178-17/+60
| | |/ / / / | |/| | | |
| * | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-163-3/+14
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-154-6/+6
| |\ \ \ \ \ \
| * | | | | | | Cocoa: change usage of deprecated API (scrolling) in LionRichard Moe Gustavsen2011-08-101-12/+14
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-315-5/+55
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Make text rendering working outside the gui thread on Symbian.Laszlo Agocs2011-08-302-0/+29
| * | | | | Fix softkeys cleanupMiikka Heikkinen2011-08-301-2/+12
| * | | | | Fix clientRect usage in QWidgetPrivate::setGeometry_sys()Miikka Heikkinen2011-08-301-1/+1
| * | | | | Do not allow fullscreen/maximized windows to expand beyond client rectMiikka Heikkinen2011-08-301-7/+9
| * | | | | Do not modify window size for fullscreen windows in setGeometry_sysMiikka Heikkinen2011-08-301-1/+10
| * | | | | Doc: Fixed \since declarations.David Boddie2011-08-301-2/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-265-55/+5
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-08-163-3/+14
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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-154-6/+6
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-08-054-7/+7
| |\ \ | | |/
| | * Fix compile errors on S60 3.2Shane Kearns2011-08-054-7/+7
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamHonglei Zhang2011-08-042-4/+4
|\ \ \
| * | | Preventing QSoftkeyManager giving false positive memory leaksmread2011-08-022-4/+4
* | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-291-3/+3
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-291-3/+3
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-07-271-4/+4
| | |\ \
| | | * | Fix compilation under OSX 10.7 or using llvm-gcc.Mike McQuaid2011-07-261-4/+4