Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 5 | -5/+16 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-18 | 5 | -5/+16 |
| |\ \ | | |/ | |||||
| | * | Fix sporadic hang in QLocalServer::close() in OS X 10.7 | Robert Knight | 2011-11-18 | 1 | -4/+4 |
| | * | Qt Linguist: Fix crash after select 2nd translation in lengthvariant | Takumi ASAKI | 2011-11-17 | 4 | -1/+12 |
* | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-11-18 | 5 | -65/+127 |
|\ \ \ | |/ / | |||||
| * | | 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 |
| |\ \ | |||||
| | * \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team | Qt Continuous Integration System | 2011-11-16 | 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 branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team | Qt Continuous Integration System | 2011-11-14 | 135 | -52407/+25153 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge remote-tracking branch 'qt-mainline/4.8' | aavit | 2011-11-14 | 135 | -52407/+25153 |
| | | |\ \ | |||||
| * | | \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-11-17 | 2 | -58/+91 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team | Qt Continuous Integration System | 2011-11-15 | 1 | -4/+15 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Minor improvements to whatlog generation in Symbian tools2 builds. | Miikka Heikkinen | 2011-11-15 | 1 | -4/+15 |
| | * | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team | Qt Continuous Integration System | 2011-11-15 | 2 | -54/+76 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Fix linux-symbian cross-compilation configure-phase for platform builing | Pasi Pentikainen | 2011-11-14 | 2 | -54/+76 |
| * | | | | | | | 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 | 38 | -180/+485 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-16 | 8 | -16/+275 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| | * | | | | | | | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-11-16 | 124 | -50916/+23481 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-11-16 | 6 | -4/+23 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Add the ability to do unsafe SSL renegotiation as a fallback. | Richard Moore | 2011-11-15 | 6 | -4/+23 |
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-11-15 | 24 | -160/+187 |
| |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | Rebuild configure.exe with support for MinGW 4.6 | Friedemann Kleint | 2011-11-16 | 1 | -0/+0 |
| | | | * | | | | | | Windows: Add gcc 4.6. | Friedemann Kleint | 2011-11-16 | 7 | -16/+275 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | 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 docs and translations generation for INTEGRITY. | Rolland Dudemaine | 2011-11-15 | 1 | -1/+1 |
| | * | | | | | | | Add XPLATFORM_INTEGRITY to define defaults for INTEGRITY. | Rolland Dudemaine | 2011-11-15 | 1 | -7/+54 |
| | * | | | | | | | Remove QT 3 API support by default for INTEGRITY. | Rolland Dudemaine | 2011-11-15 | 1 | -1/+1 |
| | * | | | | | | | Disable some tests because INTEGRITY doesn't support shared libraries. | Rolland Dudemaine | 2011-11-15 | 4 | -3/+6 |
| | * | | | | | | | Add specific INTEGRITY cases for autotests requiring a target path. | Rolland Dudemaine | 2011-11-15 | 8 | -2/+23 |
| | * | | | | | | | Improve default mkspec for INTEGRITY. | Rolland Dudemaine | 2011-11-15 | 1 | -5/+6 |
| | * | | | | | | | Use Q_FUNC_INFO without line number on GHS compiler. | Rolland Dudemaine | 2011-11-15 | 1 | -1/+1 |
| | * | | | | | | | Add INTEGRITY gbuild.* files to qmake project. | Rolland Dudemaine | 2011-11-15 | 2 | -2/+5 |
| | * | | | | | | | Use the project root from .gpj project files, instead of local path. | Rolland Dudemaine | 2011-11-15 | 1 | -3/+5 |
| | * | | | | | | | Make sure QMAKE_CXX is defined to prevent crashing on some projects. | Rolland Dudemaine | 2011-11-15 | 1 | -1/+3 |
| | * | | | | | | | Add support for .pro-type subdirectories. | Rolland Dudemaine | 2011-11-15 | 1 | -1/+1 |
| | * | | | | | | | Add relative path to the work directory, to prevent filename clashes. | Rolland Dudemaine | 2011-11-15 | 1 | -0/+4 |
| | * | | | | | | | Only call moc if the file needs it. | Rolland Dudemaine | 2011-11-15 | 1 | -2/+3 |
| | * | | | | | | | Use outname to specify the output .gpj to generate. | Rolland Dudemaine | 2011-11-15 | 1 | -3/+3 |
| | * | | | | | | | Use "dll" instead of "shared". | Rolland Dudemaine | 2011-11-15 | 1 | -1/+1 |
| | * | | | | | | | Instead of translating / into _, check if subdir is a .pro. | Rolland Dudemaine | 2011-11-15 | 1 | -2/+4 |
| | * | | | | | | | Do not generate -D defines for project types. | Rolland Dudemaine | 2011-11-15 | 1 | -1/+2 |
| | * | | | | | | | Clean up generated linker file for the shared library case. | Rolland Dudemaine | 2011-11-15 | 1 | -9/+11 |