summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.8-upstream' into master-waterWater-Team2011-11-2711-14/+14
|\
| * Merge remote-tracking branch 'qt-qa-review/master'Sergio Ahumada2011-11-2610-13/+13
| |\
| | * Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-teamQt Continuous Integration System2011-08-2210-13/+13
| | |\
| | | * Doc: Fixing typoSergio Ahumada2011-08-1710-13/+13
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-251-1/+1
| |\ \ \
| | * | | Symbian-linux crosscompilation case changesPasi Pentikainen2011-11-241-1/+1
* | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-261-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-251-3/+3
| |\ \ \ \
| | * | | | Fixes for the manifest and links.Casper van Donderen2011-11-241-3/+3
* | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-2516-198/+485
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-2416-198/+485
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Symbian: don't merge native clipboard, overwrite.Shane Kearns2011-11-221-0/+3
| | * | | | Surviving out of memory in Qt Quick appmread2011-11-2110-194/+253
| | * | | | Export QtGui functions required by QtMultimediaKit backendGareth Stockwell2011-11-183-2/+227
| | * | | | Merge remote-tracking branch 'qt/4.8'Pasi Pentikainen2011-11-1765-6433/+7559
| | |\ \ \ \
| | * | | | | fix bearer crashShane Kearns2011-11-161-1/+1
| | * | | | | Fix alignment of non-wrapped richtext QML Text elements.Miikka Heikkinen2011-11-161-1/+1
* | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-2435-49/+841
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-11-2310-7/+750
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'qt-qml-review/master' into master-qml-stagingKai Koehne2011-11-221-7/+8
| | |\ \ \ \ \ \
| | | * | | | | | DeclarativeDebugServer: Instantiate QPluginLoader on heapAurindam Jana2011-11-171-7/+8
| | | * | | | | | Properly protect access to pixmap reader thread with mutexChris Adams2011-11-141-16/+41
| | * | | | | | | Fix failing unit tests.Sarah Smith2011-11-172-0/+34
| | * | | | | | | Fix compile with -qtnamespaceSarah Smith2011-11-165-12/+15
| | * | | | | | | Properly protect access to pixmap reader thread with mutexChris Adams2011-11-151-16/+41
| | * | | | | | | Move tga support from Qt3d to Qt.Sarah Smith2011-11-149-0/+705
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-231-3/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | QNetworkProxy documentation: mention usage of "http_proxy" variablePeter Hartmann2011-11-221-3/+3
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-2324-39/+88
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Hide png symbols in a namespace for -qt-libpngDaniel Teske2011-11-2224-39/+88
* | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-238-22/+22
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-228-22/+22
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Webkit: Work around C++11 string literal source incompatibility.hjk2011-11-225-13/+13
| | * | | | | | | | | Add spaces for string concatenation to work around C++11 source incompatibility.hjk2011-11-223-9/+9
* | | | | | | | | | | Fix permission (no execute bit).Frederik Gladhorn2011-11-225-0/+0
* | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Add spaces for string concatenation to work around C++11 source incompatibility.hjk2011-11-211-1/+1
* | | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-191-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-181-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Fix sporadic hang in QLocalServer::close() in OS X 10.7Robert Knight2011-11-181-4/+4
| | | |_|_|_|/ / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-183-7/+36
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-11-172-5/+7
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Allow setting the runtime graphicssystem via QT_DEFAULT_RUNTIME_SYSTEM.Robin Burchell2011-11-161-3/+7
| | * | | | | | | | Partially revert "Set the graphics system name in the graphics system factory."Robin Burchell2011-11-161-2/+0
| | * | | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-11-1443-7708/+8860
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-171-2/+29
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | / / / / / / | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | QNAM: make systemProxyForQuery respect http_proxyArvid Ephraim Picciani2011-11-171-2/+29
* | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-1711-119/+79
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-11-1632-6234/+7098
| |\ \ \ \ \ \ \ \ \