summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-09-25 12:58:16 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-09-25 12:58:16 (GMT)
commit4a7f44a97382e84c94cf453f6129b7d38d696dd6 (patch)
treef91d6b661ac1da7c0897b1c959c8df67a370c0b3
parenta8c50d490769f587b54a8a60f592a091e2f1e05b (diff)
downloadQt-4a7f44a97382e84c94cf453f6129b7d38d696dd6.zip
Qt-4a7f44a97382e84c94cf453f6129b7d38d696dd6.tar.gz
Qt-4a7f44a97382e84c94cf453f6129b7d38d696dd6.tar.bz2
Added "requires qtscript" to qsharedmemory test pro in S60 and WinCE.
qsharedmemory autotest does not compile for S60 and WinCE without QtScript and QtScript currently does not compiled for S60, that's why the following statement was added: requires(contains(QT_CONFIG,script)) Reviewed-by: TrustMe
-rw-r--r--tests/auto/qsharedmemory/lackey/lackey.pro2
-rw-r--r--tests/auto/qsharedmemory/test/test.pro2
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qsharedmemory/lackey/lackey.pro b/tests/auto/qsharedmemory/lackey/lackey.pro
index 9d2fcad..d25a50a 100644
--- a/tests/auto/qsharedmemory/lackey/lackey.pro
+++ b/tests/auto/qsharedmemory/lackey/lackey.pro
@@ -9,6 +9,8 @@ DESTDIR = ./
win32: CONFIG += console
mac:CONFIG -= app_bundle
+requires(contains(QT_CONFIG,script))
+
DEFINES += QSHAREDMEMORY_DEBUG
DEFINES += QSYSTEMSEMAPHORE_DEBUG
diff --git a/tests/auto/qsharedmemory/test/test.pro b/tests/auto/qsharedmemory/test/test.pro
index 779a942..c9f4fec 100644
--- a/tests/auto/qsharedmemory/test/test.pro
+++ b/tests/auto/qsharedmemory/test/test.pro
@@ -18,12 +18,14 @@ TARGET = ../tst_qsharedmemory
}
wince*:{
+requires(contains(QT_CONFIG,script))
QT += gui script
addFiles.sources = ../lackey/lackey.exe ../lackey/scripts
addFiles.path = lackey
DEPLOYMENT += addFiles
DEFINES += SRCDIR=\\\"\\\"
}else:symbian*{
+requires(contains(QT_CONFIG,script))
QT += gui script
addFiles.sources = ../lackey/scripts
addFiles.path = /data/qsharedmemorytemp/lackey