diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-07 23:03:14 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-07 23:03:14 (GMT) |
commit | f67e4e1bc58d3587caa70d1be58c6da14c150ce2 (patch) | |
tree | b7837b4bdd75f6c2cb016f8637253090308cf889 /tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp | |
parent | 8ca64c4ea1484321ebaade018369fe33bcfcb02e (diff) | |
parent | 6e3ae781a7bd3b5ae2143ef60f969d89663508e3 (diff) | |
download | Qt-f67e4e1bc58d3587caa70d1be58c6da14c150ce2.zip Qt-f67e4e1bc58d3587caa70d1be58c6da14c150ce2.tar.gz Qt-f67e4e1bc58d3587caa70d1be58c6da14c150ce2.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:
Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
Fix compilation error on Solaris
Check elapsed time only once
Diffstat (limited to 'tests/auto/qscriptextensionplugin/tst_qscriptextensionplugin.cpp')
0 files changed, 0 insertions, 0 deletions