summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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-3133-71/+215
| |\
| * \ 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-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
| | * | | | Fix memory leak in ListModel custom parserBea Lam2011-09-011-0/+1
* | | | | | Merge branch 4.8 into qt-4.8-from-4.7Sergio Ahumada2011-09-018-10/+44
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-08-317-10/+21
| |\ \ \ \ \
| | * \ \ \ \ Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-3121-62/+78
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.8'Casper van Donderen2011-08-301-0/+5
| | |\ \ \ \ \ \
| | | * | | | | | Doc: Internalized QDeclarativeTypeLoaderGeir Vattekar2011-08-241-0/+5
| | | * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-17110-719/+1039
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-06-09239-5756/+8408
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge remote branch 'mainline/4.8'Casper van Donderen2011-08-30657-8818/+20058
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Doc: Said that QIODevice::isSequential returns false by defaultGeir Vattekar2011-08-231-0/+2
| | * | | | | | | | | | Doc: Said that QList::clear deallocates memoryGeir Vattekar2011-08-231-2/+2
| | * | | | | | | | | | Doc: Fix doc bug in QMouseEventGeir Vattekar2011-08-221-2/+1
| | * | | | | | | | | | Doc: Fixed doc bug in QMetaObjectGeir Vattekar2011-08-221-3/+8
| | * | | | | | | | | | Doc: Fixed date format doc bug in QDateTime/Qt namespaceGeir Vattekar2011-08-222-3/+3
| * | | | | | | | | | | 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-017-13/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | DEF file updateGareth Stockwell2011-08-312-2/+2
| * | | | | | | | | | | | Merge branch 'qt-4.7' into 4.7Liang Qi2011-08-3127-64/+155
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ 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-31578-5349/+11586
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-08-317-17/+115
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Fix Symbian system date format parsing.Miikka Heikkinen2011-08-301-8/+55
| | * | | | | | | | | | | | Fix pointer event mapping when windows are fixed to native orientationLaszlo Agocs2011-08-292-4/+38
| | * | | | | | | | | | | | Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.Miikka Heikkinen2011-08-242-4/+9
| | * | | | | | | | | | | | Giving QUuid::createUuid() more entropy on Symbianmread2011-08-241-0/+6
| | * | | | | | | | | | | | Merge branch 'xmlExtRefBuffer'Honglei Zhang2011-08-241-1/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | QXmlSimpleReader handle external entity reference file over 1kHonglei Zhang2011-08-241-1/+7
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-08-3117-34/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/4.8'Sergio Ahumada2011-08-2970-405/+833
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-08-2646-174/+336
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Disable activeqt on win32-g++ (it doesn't build).Ray Donnelly2011-08-221-1/+1
| | * | | | | | | | | | | | | | | Make the DBus timeout configurable in QDBusAbstractInterface.David Faure2011-08-193-4/+31
| | * | | | | | | | | | | | | | | 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-1812-19/+19