Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-11-19 | 1 | -4/+4 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-18 | 1 | -4/+4 |
| |\ | |||||
| | * | Fix sporadic hang in QLocalServer::close() in OS X 10.7 | Robert Knight | 2011-11-18 | 1 | -4/+4 |
* | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-11-18 | 3 | -7/+36 |
|\ \ \ | |/ / | |||||
| * | | 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 |
| |\ \ | |||||
| | * | | 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 remote-tracking branch 'qt-mainline/4.8' | aavit | 2011-11-14 | 43 | -7708/+8860 |
| | |\ \ | |||||
| * | \ \ | 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 '4.8-upstream' into master-water | Water-Team | 2011-11-17 | 11 | -119/+79 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-11-16 | 32 | -6234/+7098 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-11-16 | 5 | -4/+20 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Add the ability to do unsafe SSL renegotiation as a fallback. | Richard Moore | 2011-11-15 | 5 | -4/+20 |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-15 | 5 | -115/+52 |
| | |\ \ \ \ | |||||
| * | | | | | | Windows: Add gcc 4.6. | Friedemann Kleint | 2011-11-16 | 1 | -0/+7 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Amend qfiledialog INTEGRITY patch | Harald Fernengel | 2011-11-15 | 1 | -1/+1 |
| * | | | | | Update to latest INTEGRITY Framebuffer API. | Rolland Dudemaine | 2011-11-15 | 1 | -110/+44 |
| * | | | | | Remove support for tilde expansion as there is no home on INTEGRITY. | Rolland Dudemaine | 2011-11-15 | 1 | -0/+2 |
| * | | | | | Remove QT 3 API support by default for INTEGRITY. | Rolland Dudemaine | 2011-11-15 | 1 | -1/+1 |
| * | | | | | Use Q_FUNC_INFO without line number on GHS compiler. | Rolland Dudemaine | 2011-11-15 | 1 | -1/+1 |
| * | | | | | Resolve atomic operations issues on INTEGRITY. | Rolland Dudemaine | 2011-11-15 | 1 | -3/+4 |
* | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-11-16 | 8 | -48/+167 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | 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 | 3 | -4/+23 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-11-15 | 4 | -6/+27 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | 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 | 1 | -2/+4 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Fix crash in QHttpNetworkReplyPrivate::gunzipBodyPartiallyEnd | Sami Rosendahl | 2011-11-11 | 1 | -2/+4 |
| | | * | | | | | | | 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 | 2 | -6/+18 |
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | |||||
| | | | * | | | | | | symbian - handle path being passed as part of filename in QTranslator | Shane Kearns | 2011-11-07 | 1 | -3/+15 |
| | | | * | | | | | | Symbian - fix compile error when default configured | Shane Kearns | 2011-11-07 | 1 | -3/+3 |
| | | * | | | | | | | Compile when -no-rtti is specified as a configure option | Andy Shaw | 2011-11-07 | 1 | -0/+4 |
| | | |/ / / / / / | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-11-15 | 1 | -16/+41 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | * | | | | | | | Properly protect access to pixmap reader thread with mutex | Chris Adams | 2011-11-15 | 1 | -16/+41 |
| * | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | |||||
| | * | | | | | | | Revert "Improved performance of mapFromGlobal/mapToGlobal on X11" | Friedemann Kleint | 2011-11-14 | 1 | -28/+0 |
| | * | | | | | | | Fix QDockWidget titlebar button positioning on Mac OS X | Pasi Matilainen | 2011-11-14 | 1 | -0/+101 |
| | * | | | | | | | Fixed memory leak in Windows Vista style widgets | Tero Ahola | 2011-11-14 | 1 | -0/+1 |
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-11-14 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | HTTP: blacklist server for pipelining | Peter Hartmann | 2011-11-14 | 1 | -0/+1 |
* | | | | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-11-15 | 4 | -26/+35 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-11-14 | 3 | -25/+34 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Fix regression in styleName searching | Jiang Jiang | 2011-11-09 | 2 | -24/+10 |
| | * | | | | | | Fix styleName listing with the same QtFontStyle::Key value | Jiang Jiang | 2011-11-08 | 1 | -14/+17 |
| | * | | | | | | Fix localized font family access in OS X | Jiang Jiang | 2011-11-08 | 2 | -4/+24 |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| | * | | | | | | Fix for the button size calculation in qmessagebox.cpp | Mikko Knuutila | 2011-11-14 | 1 | -1/+1 |
* | | | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-11-13 | 13 | -22/+60 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-12 | 6 | -13/+22 |
| |\ \ \ \ \ \ \ | | |/ / / / / / |