summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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-178-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-1624-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-166-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-152-0/+40
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | network auto tests: add QNetworkReply test for pipeliningPeter Hartmann2011-11-141-0/+39
| * | | | | | | | | HTTP: blacklist server for pipeliningPeter Hartmann2011-11-141-0/+1
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-11-154-25/+48
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-131-1/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove font that may not exists in some OS X systemsJiang Jiang2011-11-131-1/+0
| * | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-104-25/+49
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Fix regression in styleName searchingJiang Jiang2011-11-092-24/+10
| | * | | | | | | | | | Fix styleName listing with the same QtFontStyle::Key valueJiang Jiang2011-11-081-14/+17
| | * | | | | | | | | | Fix localized font family access in OS XJiang Jiang2011-11-083-4/+39
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-142-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-139-24/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-11-124-6/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Re-apply change e3208a8d44423bc3b5c32e2e90f68675e51a3b73 by Andreas KlingAndreas Kling2011-11-091-1/+1
| * | | | | | | | | | | | | | Re-apply change 37cde52cb17b57f8ec89c248f06331ed4977e51c by Ademar de Souza R...Ademar de Souza Reis Jr2011-11-091-1/+1
| * | | | | | | | | | | | | | Re-apply change 945c44d0865cf44363e6c860995f971ce952dd5f by Ademar de Souza R...Ademar de Souza Reis Jr2011-11-091-43/+43
| * | | | | | | | | | | | | | Updated WebKit to 52a11cec052aa40d3bbc06861be1177b649b4a99Zeno Albisser2011-11-096-51/+73
* | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-124-3/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEndSami Rosendahl2011-11-112-2/+27
| * | | | | | | | | | | | | | Fix warning when using QXmlInputSource with non opened QIODeviceShane Kearns2011-11-111-1/+2
| * | | | | | | | | | | | | | HTTP proxy engine - accept standard Connection headerShane Kearns2011-11-111-0/+4
* | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master...Qt Continuous Integration System2011-11-1210-1919/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-11-118-1917/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \