summaryrefslogtreecommitdiffstats
path: root/src
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 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
| |\ \
| * \ \ 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
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-11-092-6/+18
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | symbian - handle path being passed as part of filename in QTranslatorShane Kearns2011-11-071-3/+15
| | | | * | | | Symbian - fix compile error when default configuredShane Kearns2011-11-071-3/+3
| | | * | | | | Compile when -no-rtti is specified as a configure optionAndy Shaw2011-11-071-0/+4
| | | |/ / / /
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-151-16/+41
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Properly protect access to pixmap reader thread with mutexChris Adams2011-11-151-16/+41
| * | | | | | 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-earth-staging into mast...Qt Continuous Integration System2011-11-141-0/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | 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-143-25/+34
| |\ \ \ \ \ \ \
| | * | | | | | | 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-082-4/+24
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-141-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-126-13/+22
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ 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-123-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEndSami Rosendahl2011-11-111-2/+4
| | * | | | | | | | | | 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-symbian-staging into ma...Qt Continuous Integration System2011-11-112-0/+10
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix memory leak in QCursorDataMiikka Heikkinen2011-11-101-0/+5
| | * | | | | | | | | | | Merge remote-tracking branch 'flex/master'Pasi Pentikainen2011-11-101-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Create cleanup stack in idleDetectorThreadhelanti2011-11-091-0/+5
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-111-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-103-27/+47
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-105-6161/+6738
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | networking: regenerate effective TLD table for cookiesPeter Hartmann2011-11-102-6158/+6730
| | * | | | | | | | | | | | | | QNAM: Fix authentication cache when the password is in the URLOlivier Goffart2011-11-083-3/+8
| * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-11-102-3/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix to QtOpenGL crash on SymbianJani Hautakangas2011-11-082-3/+32
| * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-105-12/+161
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | WINSCW def file update so that qtgui can pick up virtual from qtcoremread2011-11-091-2/+3
| | * | | | | | | | | | | | | | Preventing zero-timer lockups when Symbian's active scheduler usedmread2011-11-083-9/+155
| | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |