diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-20 10:33:38 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-20 10:33:38 +1000 |
| commit | 367a89cf5cb1282d2e966c83869a56fd22745779 (patch) | |
| tree | 75983b6d38d31129ff4662248a587cf8ce6dc58e /doc/src/snippets/code/src_script_qscriptengine.cpp | |
| parent | 3a7e23ef51b6099fc6dcfca36e04ec61bfa4337b (diff) | |
| parent | 0d0c1082f74888044713d96deca2d510951d018a (diff) | |
| download | qt4-tools-367a89cf5cb1282d2e966c83869a56fd22745779.tar.gz | |
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:
Fixed automatic plugin path resolving for predefined Qt plugins.
Resolve a number of compilation issues with INTEGRITY
Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptengine.cpp')
0 files changed, 0 insertions, 0 deletions