summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-0816-111/+69
|\
| * Ensure that the proxystyle is used over the style's own functionsAndy Shaw2011-09-071-11/+7
| * Replace explicit surrogate handlers by inline methods of QChar classsuzuki toshiya2011-09-0715-100/+62
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-072-1/+9
|\ \ | |/
| * Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-062-1/+9
* | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-09-0310-24/+514
|\ \
| * | Update license headersGabriel de Dietrich2011-09-013-54/+57
| * | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-3110-12/+71
| |\ \
| * \ \ Merge branch '4.8' into water-team-masterFrederik Gladhorn2011-08-3110-24/+511
| |\ \ \
| | * | | Introduce menubar plugin systemAurélien Gâteau2011-06-204-1/+42
| | * | | Introduce QAbstractPlatformMenuBarAurélien Gâteau2011-06-206-11/+457
| | * | | Hide Q<Platform>MenuActionAurelien Gateau2011-06-205-10/+10
| | * | | Fix warning about initialization orderAurélien Gâteau2011-06-201-3/+3
* | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-021-4/+4
|\ \ \ \ \
| * | | | | URLs used with scheme handler use appropriate encoding for schememread2011-09-011-4/+4
* | | | | | Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-012-2/+24
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | 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-317-22/+27
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-3044-248/+373
| | |\ \ \ \ \ \
| | * | | | | | | Doc: Fix doc bug in QMouseEventGeir Vattekar2011-08-221-2/+1
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-08-311-0/+23
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Fix build with Clang for libpng versions 1.4.0 to 1.5.2Tor Arne Vestbø2011-08-311-0/+23
* | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-09-015-11/+16
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge branch 'qt-4.7' into 4.7Liang Qi2011-08-3110-29/+118
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Sami Merila2011-08-314-9/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Prevent leakage of native window handlesGareth Stockwell2011-08-314-9/+14
| * | | | | | | | | | If automatic translation of input widget is off, skip resetSami Merila2011-08-311-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-3140-192/+371
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-08-316-6/+9
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | / / | | |_|_|_|_|_|/ / | |/| | | | | | |
| | * | | | | | | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-2922-157/+94
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-2625-84/+229
| | |\ \ \ \ \ \ \
| | * | | | | | | | Revert "Fix build with the Clang compiler"Tor Arne Vestbø2011-08-181-3/+3
| | * | | | | | | | Replace 'i < len-1 && func(i+1)' by 'i+1 < len && func(i+1)'suzuki toshiya2011-08-184-5/+5
| | * | | | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-1818-95/+174
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fix build with the Clang compilerTor Arne Vestbø2011-08-161-3/+3
| | * | | | | | | | | Add support for rawFonts loaded from data in FaceIdPierre Rossi2011-08-152-1/+4
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-301-16/+18
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | FocusScope's focusItem must always be a descendentAlan Alpert2011-08-301-16/+18
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-08-281-2/+1
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'qt/4.8'Sami Lempinen2011-08-2328-119/+252
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix warning about missing qs60keycapture_p.h header in guiMiikka Heikkinen2011-08-101-2/+1
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-08-286-15/+25
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-08-246-15/+25
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Revert "Include trailing space width in RTL text line width"Eskil Abrahamsen Blomfeldt2011-08-241-5/+1
| | | * | | | | | | | | | | Fix justification of RTL textEskil Abrahamsen Blomfeldt2011-08-241-1/+2
| | | * | | | | | | | | | | Use CoreText for font rendering on uikit.Eike Ziller2011-08-244-9/+22
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-08-272-3/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Check if bridge plugin vector is still valid.Frederik Gladhorn2011-08-261-1/+1