summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.8-upstream' into master-waterWater-Team2011-11-221-1/+1
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-211-1/+1
| |\
| | * Add spaces for string concatenation to work around C++11 source incompatibility.hjk2011-11-211-1/+1
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-195-5/+16
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-185-5/+16
| |\ \ | | |/
| | * Fix sporadic hang in QLocalServer::close() in OS X 10.7Robert Knight2011-11-181-4/+4
| | * Qt Linguist: Fix crash after select 2nd translation in lengthvariantTakumi ASAKI2011-11-174-1/+12
* | | Merge branch '4.8-upstream' into master-waterWater-Team2011-11-185-65/+127
|\ \ \ | |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-11-172-5/+7
| |\ \
| | * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-162-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 branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-11-14135-52407/+25153
| | |\ \ \ | | | |/ /
| | | * | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-11-14135-52407/+25153
| | | |\ \
| * | | \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma...Qt Continuous Integration System2011-11-172-58/+91
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-151-4/+15
| | |\ \ \ \ \
| | | * | | | | Minor improvements to whatlog generation in Symbian tools2 builds.Miikka Heikkinen2011-11-151-4/+15
| | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-teamQt Continuous Integration System2011-11-152-54/+76
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Fix linux-symbian cross-compilation configure-phase for platform builingPasi Pentikainen2011-11-142-54/+76
| * | | | | | | 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-1738-180/+485
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-168-16/+275
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-11-16124-50916/+23481
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-11-166-4/+23
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Add the ability to do unsafe SSL renegotiation as a fallback.Richard Moore2011-11-156-4/+23
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-11-1524-160/+187
| |\ \ \ \ \ \ \ \
| | | | * | | | | | Rebuild configure.exe with support for MinGW 4.6Friedemann Kleint2011-11-161-0/+0
| | | | * | | | | | Windows: Add gcc 4.6.Friedemann Kleint2011-11-167-16/+275
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | 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 docs and translations generation for INTEGRITY.Rolland Dudemaine2011-11-151-1/+1
| | * | | | | | | Add XPLATFORM_INTEGRITY to define defaults for INTEGRITY.Rolland Dudemaine2011-11-151-7/+54
| | * | | | | | | Remove QT 3 API support by default for INTEGRITY.Rolland Dudemaine2011-11-151-1/+1
| | * | | | | | | Disable some tests because INTEGRITY doesn't support shared libraries.Rolland Dudemaine2011-11-154-3/+6
| | * | | | | | | Add specific INTEGRITY cases for autotests requiring a target path.Rolland Dudemaine2011-11-158-2/+23
| | * | | | | | | Improve default mkspec for INTEGRITY.Rolland Dudemaine2011-11-151-5/+6
| | * | | | | | | Use Q_FUNC_INFO without line number on GHS compiler.Rolland Dudemaine2011-11-151-1/+1
| | * | | | | | | Add INTEGRITY gbuild.* files to qmake project.Rolland Dudemaine2011-11-152-2/+5
| | * | | | | | | Use the project root from .gpj project files, instead of local path.Rolland Dudemaine2011-11-151-3/+5
| | * | | | | | | Make sure QMAKE_CXX is defined to prevent crashing on some projects.Rolland Dudemaine2011-11-151-1/+3
| | * | | | | | | Add support for .pro-type subdirectories.Rolland Dudemaine2011-11-151-1/+1
| | * | | | | | | Add relative path to the work directory, to prevent filename clashes.Rolland Dudemaine2011-11-151-0/+4
| | * | | | | | | Only call moc if the file needs it.Rolland Dudemaine2011-11-151-2/+3
| | * | | | | | | Use outname to specify the output .gpj to generate.Rolland Dudemaine2011-11-151-3/+3
| | * | | | | | | Use "dll" instead of "shared".Rolland Dudemaine2011-11-151-1/+1
| | * | | | | | | Instead of translating / into _, check if subdir is a .pro.Rolland Dudemaine2011-11-151-2/+4
| | * | | | | | | Do not generate -D defines for project types.Rolland Dudemaine2011-11-151-1/+2
| | * | | | | | | Clean up generated linker file for the shared library case.Rolland Dudemaine2011-11-151-9/+11