summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-2211-26/+26
|\
| * 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-226-13/+13
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-225-2110/+1983
|\ \ | |/
| * First batch of French translations updatesPierre Rossi2011-11-215-2110/+1983
* | 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-185-5/+16
|\ \ | |/
| * Fix sporadic hang in QLocalServer::close() in OS X 10.7Robert Knight2011-11-181-4/+4
| * Qt Linguist: Fix crash after select 2nd translation in lengthvariantTakumi ASAKI2011-11-174-1/+12
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-11-172-5/+7
|\ \
| * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-162-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 branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-14135-52407/+25153
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-11-14135-52407/+25153
| | |\ \
* | | \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-172-58/+91
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-151-4/+15
| |\ \ \ \ \
| | * | | | | Minor improvements to whatlog generation in Symbian tools2 builds.Miikka Heikkinen2011-11-151-4/+15
| * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-152-54/+76
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix linux-symbian cross-compilation configure-phase for platform builingPasi Pentikainen2011-11-142-54/+76
* | | | | | | 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 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-168-16/+275
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-11-16124-50916/+23481
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-166-4/+23
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Add the ability to do unsafe SSL renegotiation as a fallback.Richard Moore2011-11-156-4/+23
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-1524-160/+187
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-11-156-6/+65
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-11-158-8/+92
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integr...Qt Continuous Integration System2011-11-151-0/+4
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | tests: allow unstable tests to be marked with CONFIG+=insignificant_testRohan McGovern2011-11-151-0/+4
| | * | | | | | | | | | 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-112-2/+27
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEndSami Rosendahl2011-11-112-2/+27
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-11-095-8/+57
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | symbian - handle path being passed as part of filename in QTranslatorShane Kearns2011-11-074-5/+54
| | | * | | | | | | | | | | Symbian - fix compile error when default configuredShane Kearns2011-11-071-3/+3
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-11-082-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Compile when -no-rtti is specified as a configure optionAndy Shaw2011-11-071-0/+4
| | | * | | | | | | | | | | Ensure that the RC_FILE is correctly handled in a single configurationAndy Shaw2011-11-071-0/+1
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-153-16/+126
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Properly protect access to pixmap reader thread with mutexChris Adams2011-11-153-16/+126
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-153-28/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-152-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Update the supported platforms page.Casper van Donderen2011-11-141-1/+5
| * | | | | | | | | | | | | | Increase qdoc3 stack size when using MSVC to 4M.Casper van Donderen2011-11-141-0/+5
* | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-142-0/+40
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | network auto tests: add QNetworkReply test for pipeliningPeter Hartmann2011-11-141-0/+39