summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Fix Symbian def-filePasi Pentikainen2011-11-291-227/+227
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-282-0/+12
|\
| * SSL: fix build when compiled with -openssl-linkedPeter Hartmann2011-11-282-0/+12
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-286-4/+16
|\ \ | |/ |/|
| * Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-255-1/+16
| |\
| | * New API to set AVKON flag to inputcontext in Qt/Symbian.Satyam Bandarapu2011-11-255-1/+16
| * | Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-251-3/+0
| |\ \ | | |/
| | * Fixing memory leak in QtGui qt_cleanupJani Hyvonen2011-11-221-3/+0
* | | 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 '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 '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 '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 '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
* | | | | | | | | | 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 '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 '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 remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-11-1632-6234/+7098
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-165-4/+20
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Add the ability to do unsafe SSL renegotiation as a fallback.Richard Moore2011-11-155-4/+20