summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allocate 16-byte aligned memory independent of platform for raster pool.Samuel Rødal2011-09-091-37/+17
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-09-083-5/+6
|\
| * Fix trailing spaces problem by not adding it to QScriptLine.lengthJiang Jiang2011-09-083-5/+6
* | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-08216-1573/+4301
|\ \ | |/ |/|
| * Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-085-2/+62
| |\
| | * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-075-2/+62
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-075-2/+62
| | | |\
| | | | * Dragging in nested views no longer works as expectedMartin Jones2011-09-071-1/+1
| | | | * Fix implicit height not growing when pre-edit text wraps.Andrew den Exter2011-09-062-1/+47
| | | | * Fix leak in State element.Michael Brasser2011-09-021-0/+12
| | | | * Fix leak in bindings created by PropertyChanges.Michael Brasser2011-09-011-0/+2
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-0712-7/+51
| |\ \ \ \
| | * | | | fix build for desktopKonstantin Ritt2011-09-072-2/+13
| | * | | | Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-0610-5/+38
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-09-0726-77/+364
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'qt-air-review/master'Sergio Ahumada2011-09-0626-77/+364
| | |\ \ \ \ \ | |/ / / / / /
| | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-09-0626-77/+364
| | |\ \ \ \ \
| | | * | | | | Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)Ademar de Souza Reis Jr2011-09-0626-77/+364
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-09-067-6/+65
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'qt-air-review/master'Sergio Ahumada2011-09-067-6/+65
| | |\ \ \ \ \ \ \ | |/ / / / / / / / | | | _ / / / / / | | | / / / / /
| | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-09-05315-4753/+20941
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4Ademar de Souza Reis Jr2011-08-307-6/+65
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-052-2/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Removed the unnecessary dependency of the QtHelp module on the QtXml oneConstantin Makshin2011-09-052-2/+1
| * | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-0342-100/+415
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-09-0313-63/+521
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-09-039-202/+168
| |\ \ \ \ \ \ \
| | * | | | | | | Modified \since command behavior slightly to handle project and version.David Boddie2011-09-029-202/+168
| | * | | | | | | Merge remote-tracking branch 'origin/4.8'Liang Qi2011-09-0238-112/+353
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-09-0211-25/+521
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-09-01610-6034/+13579
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Update license headersGabriel de Dietrich2011-09-013-54/+57
| | | * | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-31120-1143/+2604
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Silently ignore a wrong parameter count instead of crashingPeter Grasch2011-08-311-4/+5
| | | * | | | | | | | | | Introducing --address <bus> parameter to qdbusPeter Grasch2011-08-311-1/+6
| | | * | | | | | | | | | 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.8-upstream' into master-waterWater-Team2011-08-30481-4866/+10454
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-292-4/+77
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-292-4/+77
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-08-2899-966/+1249
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-08-2834-112/+477
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-2764-853/+769
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-08-262-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-09-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Added an additional check to workaround an issue on Windows.David Boddie2011-09-021-1/+1
| | | | | | | | | | | | * | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-023-8/+12
| | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | |_|/ / | | | | | | | | | | | | | |/| | |