summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \
| | * \ \ \ \ \ 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
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-155-115/+52
| | |\ \ \ \ \ \
| * | | | | | | | Windows: Add gcc 4.6.Friedemann Kleint2011-11-161-0/+7
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Amend qfiledialog INTEGRITY patchHarald Fernengel2011-11-151-1/+1
| * | | | | | | Update to latest INTEGRITY Framebuffer API.Rolland Dudemaine2011-11-151-110/+44
| * | | | | | | Remove support for tilde expansion as there is no home on INTEGRITY.Rolland Dudemaine2011-11-151-0/+2
| * | | | | | | Remove QT 3 API support by default for INTEGRITY.Rolland Dudemaine2011-11-151-1/+1
| * | | | | | | Use Q_FUNC_INFO without line number on GHS compiler.Rolland Dudemaine2011-11-151-1/+1
| * | | | | | | Resolve atomic operations issues on INTEGRITY.Rolland Dudemaine2011-11-151-3/+4
* | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-168-48/+167
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-11-153-4/+23
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-11-154-6/+27
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-11-151-1/+4
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fix focusScopeItemChange setting crashDamian Jansen2011-11-151-1/+4
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-11-111-2/+4
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEndSami Rosendahl2011-11-111-2/+4