Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-11-24 | 35 | -49/+841 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-11-23 | 10 | -7/+750 |
| |\ | |||||
| | * | Merge remote-tracking branch 'qt-qml-review/master' into master-qml-staging | Kai Koehne | 2011-11-22 | 1 | -7/+8 |
| | |\ | |||||
| | | * | DeclarativeDebugServer: Instantiate QPluginLoader on heap | Aurindam Jana | 2011-11-17 | 1 | -7/+8 |
| | | * | Properly protect access to pixmap reader thread with mutex | Chris Adams | 2011-11-14 | 1 | -16/+41 |
| | * | | Fix failing unit tests. | Sarah Smith | 2011-11-17 | 2 | -0/+34 |
| | * | | Fix compile with -qtnamespace | Sarah Smith | 2011-11-16 | 5 | -12/+15 |
| | * | | Properly protect access to pixmap reader thread with mutex | Chris Adams | 2011-11-15 | 1 | -16/+41 |
| | * | | Move tga support from Qt3d to Qt. | Sarah Smith | 2011-11-14 | 9 | -0/+705 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-11-23 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * | | | QNetworkProxy documentation: mention usage of "http_proxy" variable | Peter Hartmann | 2011-11-22 | 1 | -3/+3 |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-23 | 24 | -39/+88 |
| |\ \ \ \ | |||||
| | * | | | | Hide png symbols in a namespace for -qt-libpng | Daniel Teske | 2011-11-22 | 24 | -39/+88 |
* | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-11-23 | 8 | -22/+22 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-22 | 8 | -22/+22 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | 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 | 3 | -9/+9 |
* | | | | | | Fix permission (no execute bit). | Frederik Gladhorn | 2011-11-22 | 5 | -0/+0 |
* | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-11-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 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 '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 |