diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-22 18:53:29 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-22 18:53:29 (GMT) |
commit | 3fa2a510aae1e0c5e18f3b6962c54fae92f3d176 (patch) | |
tree | f05201cea09f1885769362c25578f7da78541ee0 /src/testlib/qbenchmarkevent_p.h | |
parent | 538e7b8ddf45936bb274ed3230b591b3459edfa7 (diff) | |
parent | 9e06896a9a49685dc97eb2aafdf55eef33a75507 (diff) | |
download | Qt-3fa2a510aae1e0c5e18f3b6962c54fae92f3d176.zip Qt-3fa2a510aae1e0c5e18f3b6962c54fae92f3d176.tar.gz Qt-3fa2a510aae1e0c5e18f3b6962c54fae92f3d176.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Make lupdate recognize TRANSLATOR comments in QtScript files
no_debug_info.prf: Also handle MSVC.
Revert "Don't destroy Qt's internal pthread_key_t if it was not initialized"
Revert "Resolve two save/restore geometry issues on X11."
Fix QScriptValue::construct.
Split tst_QScriptValue::construct tests into smaller chunks.
Docs: QTBUG-10866 Description of how an AutoConnection is resolved.
Add script translation test data for plural forms
Refactor script translation tests
Resolve two save/restore geometry issues on X11.
Split newQObject tests into smaller chunks.
Compile fix
Don't destroy Qt's internal pthread_key_t if it was not initialized
Diffstat (limited to 'src/testlib/qbenchmarkevent_p.h')
0 files changed, 0 insertions, 0 deletions