summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | * | | | | | | 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
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Revert "Improved performance of mapFromGlobal/mapToGlobal on X11"Friedemann Kleint2011-11-141-28/+0
| | * | | | | | | Fix QDockWidget titlebar button positioning on Mac OS XPasi Matilainen2011-11-141-0/+101
| | * | | | | | | Fixed memory leak in Windows Vista style widgetsTero Ahola2011-11-141-0/+1
| * | | | | | | | 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 '4.8-upstream' into master-waterWater-Team2011-11-154-26/+35
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Fix for the button size calculation in qmessagebox.cppMikko Knuutila2011-11-141-1/+1
* | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-1313-22/+60
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-126-13/+22
| |\ \ \ \ \ \ \ | | |/ / / / / /