Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-22 | 11 | -26/+26 |
|\ | |||||
| * | Webkit: Work around C++11 string literal source incompatibility. | hjk | 2011-11-22 | 5 | -13/+13 |
| * | Add spaces for string concatenation to work around C++11 source incompatibility. | hjk | 2011-11-22 | 6 | -13/+13 |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-22 | 5 | -2110/+1983 |
|\ \ | |/ | |||||
| * | First batch of French translations updates | Pierre Rossi | 2011-11-21 | 5 | -2110/+1983 |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-21 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Add spaces for string concatenation to work around C++11 source incompatibility. | hjk | 2011-11-21 | 1 | -1/+1 |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-18 | 5 | -5/+16 |
|\ \ | |/ | |||||
| * | Fix sporadic hang in QLocalServer::close() in OS X 10.7 | Robert Knight | 2011-11-18 | 1 | -4/+4 |
| * | Qt Linguist: Fix crash after select 2nd translation in lengthvariant | Takumi ASAKI | 2011-11-17 | 4 | -1/+12 |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-11-17 | 2 | -5/+7 |
|\ \ | |||||
| * \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team | Qt Continuous Integration System | 2011-11-16 | 2 | -5/+7 |
| |\ \ | |||||
| | * | | Allow setting the runtime graphicssystem via QT_DEFAULT_RUNTIME_SYSTEM. | Robin Burchell | 2011-11-16 | 1 | -3/+7 |
| | * | | Partially revert "Set the graphics system name in the graphics system factory." | Robin Burchell | 2011-11-16 | 1 | -2/+0 |
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team | Qt Continuous Integration System | 2011-11-14 | 135 | -52407/+25153 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'qt-mainline/4.8' | aavit | 2011-11-14 | 135 | -52407/+25153 |
| | |\ \ | |||||
* | | \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-11-17 | 2 | -58/+91 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team | Qt Continuous Integration System | 2011-11-15 | 1 | -4/+15 |
| |\ \ \ \ \ | |||||
| | * | | | | | Minor improvements to whatlog generation in Symbian tools2 builds. | Miikka Heikkinen | 2011-11-15 | 1 | -4/+15 |
| * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team | Qt Continuous Integration System | 2011-11-15 | 2 | -54/+76 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fix linux-symbian cross-compilation configure-phase for platform builing | Pasi Pentikainen | 2011-11-14 | 2 | -54/+76 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-11-17 | 1 | -2/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | QNAM: make systemProxyForQuery respect http_proxy | Arvid Ephraim Picciani | 2011-11-17 | 1 | -2/+29 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-16 | 8 | -16/+275 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-11-16 | 124 | -50916/+23481 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-11-16 | 6 | -4/+23 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Add the ability to do unsafe SSL renegotiation as a fallback. | Richard Moore | 2011-11-15 | 6 | -4/+23 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-15 | 24 | -160/+187 |
|\ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-11-15 | 6 | -6/+65 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-11-15 | 8 | -8/+92 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qa-staging into 4.7-integr... | Qt Continuous Integration System | 2011-11-15 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | tests: allow unstable tests to be marked with CONFIG+=insignificant_test | Rohan McGovern | 2011-11-15 | 1 | -0/+4 |
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-11-15 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | Fix focusScopeItemChange setting crash | Damian Jansen | 2011-11-15 | 1 | -1/+4 |
| | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-11-11 | 2 | -2/+27 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd | Sami Rosendahl | 2011-11-11 | 2 | -2/+27 |
| | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-11-09 | 5 | -8/+57 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | symbian - handle path being passed as part of filename in QTranslator | Shane Kearns | 2011-11-07 | 4 | -5/+54 |
| | | * | | | | | | | | | | | Symbian - fix compile error when default configured | Shane Kearns | 2011-11-07 | 1 | -3/+3 |
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-11-08 | 2 | -0/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Compile when -no-rtti is specified as a configure option | Andy Shaw | 2011-11-07 | 1 | -0/+4 |
| | | * | | | | | | | | | | | Ensure that the RC_FILE is correctly handled in a single configuration | Andy Shaw | 2011-11-07 | 1 | -0/+1 |
| | |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-11-15 | 3 | -16/+126 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Properly protect access to pixmap reader thread with mutex | Chris Adams | 2011-11-15 | 3 | -16/+126 |
* | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-15 | 3 | -28/+102 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-11-15 | 2 | -1/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Update the supported platforms page. | Casper van Donderen | 2011-11-14 | 1 | -1/+5 |
| * | | | | | | | | | | | | | | Increase qdoc3 stack size when using MSVC to 4M. | Casper van Donderen | 2011-11-14 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-11-14 | 2 | -0/+40 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | network auto tests: add QNetworkReply test for pipelining | Peter Hartmann | 2011-11-14 | 1 | -0/+39 |