diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-09 18:24:50 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-09 18:24:50 (GMT) |
| commit | 9b760682e5686e9df7ccf181cea3c3440aa08647 (patch) | |
| tree | dc1282d71d5de8bd5fed5b57de7c0850ddd9a71f | |
| parent | 6eefc825b3be3ae9d695a08b6990e82a87d48481 (diff) | |
| parent | 64eae0f9a3f94d31abb6e6f2035e6758b0b46c98 (diff) | |
| download | Qt-9b760682e5686e9df7ccf181cea3c3440aa08647.zip Qt-9b760682e5686e9df7ccf181cea3c3440aa08647.tar.gz Qt-9b760682e5686e9df7ccf181cea3c3440aa08647.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
tests: fixed compile of qscriptextensionplugin test with high -jN
| -rw-r--r-- | tests/auto/qscriptextensionplugin/qscriptextensionplugin.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qscriptextensionplugin/qscriptextensionplugin.pro b/tests/auto/qscriptextensionplugin/qscriptextensionplugin.pro index d4671c8..48f0eb9 100644 --- a/tests/auto/qscriptextensionplugin/qscriptextensionplugin.pro +++ b/tests/auto/qscriptextensionplugin/qscriptextensionplugin.pro @@ -1,3 +1,4 @@ TEMPLATE = subdirs CONFIG -= app_bundle +test.depends = simpleplugin staticplugin SUBDIRS = simpleplugin staticplugin test |