diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-03 08:37:11 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-03 08:37:11 (GMT) |
commit | 60e65cc23bf1df213320604062ef98e40c46d3df (patch) | |
tree | 346becbd879f7f8e3789ae517353232f18f67c6d /LICENSE.FDL | |
parent | 43482fcfc106864f104f463002575c389d40b12f (diff) | |
parent | 7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58 (diff) | |
download | Qt-60e65cc23bf1df213320604062ef98e40c46d3df.zip Qt-60e65cc23bf1df213320604062ef98e40c46d3df.tar.gz Qt-60e65cc23bf1df213320604062ef98e40c46d3df.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (25 commits)
Fix compilation
Fix the build of configure.exe.
Update the source file of configure.exe to enable QtConcurrent for Symbian
Get rid of "typename, typename" for TEMPLATE_TEMPLATE_PARAMETERS.
Compile with msvc
compile with windows
get rid of the DisableIfSame hack
Update configure to enable QtConcurrent for Symbian
Rewrite the interfaces of QtConcurrent.
Fix namespace issue with the global static
Fix regression with QSettings patch
Reduce open and stat system calls for QSettings
QNetworkCookie: allow spaces in unquoted values
fix tst_qscriptengine after merging MR-1149
QAbstractSocket: Fix waitForReadyRead infinite loop.
Fixes warnings about unused variables
Fixes warnings about unused variables
Fixes warnings about unused variables
Fixes warnings
Fixes warnings about unused variables
...
Diffstat (limited to 'LICENSE.FDL')
0 files changed, 0 insertions, 0 deletions