summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-09-021-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | URLs used with scheme handler use appropriate encoding for schememread2011-09-011-4/+4
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-022-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Revert readonly BorderImage::sourceSize changeMartin Jones2011-09-012-4/+8
* | | | | | | | | | | | | | | Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-0128-88/+491
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-08-311-9/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Designer: Fix static linking.Jarek Kobus2011-08-311-9/+2
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-3127-81/+436
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-3165-985/+1892
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt-doc-review/master'Casper van Donderen2011-08-31589-5824/+12076
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-30757-9626/+31639
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.8'Casper van Donderen2011-08-3019-68/+380
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | qdoc3: Updates to qdoc to print error message in ALL CAPSMartin Smith2011-08-291-2/+2
| | | | * | | | | | | | | | | | | | | Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-30747-9564/+31265
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-251-6/+8
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-08-248-21/+56
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Doc: Added links to the plugin deployment guide.David Boddie2011-08-221-6/+8
| | | * | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-231-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Doc: Said that QIODevice::isSequential returns false by defaultGeir Vattekar2011-08-231-0/+2
| | | * | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-231-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | Doc: Said that QList::clear deallocates memoryGeir Vattekar2011-08-231-2/+2
| | | * | | | | | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-08-225-19/+28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | Doc: Updated platform notes for MultiMedia and PhononGeir Vattekar2011-08-221-11/+16
| | | | * | | | | | | | | | | | | | | | | Doc: Fix doc bug in QMouseEventGeir Vattekar2011-08-221-2/+1
| | | | * | | | | | | | | | | | | | | | | Doc: Fixed doc bug in QMetaObjectGeir Vattekar2011-08-221-3/+8