summaryrefslogtreecommitdiffstats
path: root/tests/auto/qscriptengine
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-06-29 12:19:47 (GMT)
committeraxis <qt-info@nokia.com>2010-06-29 12:19:47 (GMT)
commit0b3ca8620fdc66e726a3db5c50656ed0616d37c7 (patch)
tree7fd810a20f4ecfe2410f9248b58a99ef8ce22797 /tests/auto/qscriptengine
parent5010e95f36e14cf39631c0f5bfb1d630f10b00ed (diff)
parent2de30dafb76388b4e9ea5b8d6ea385d81da7ea37 (diff)
downloadQt-0b3ca8620fdc66e726a3db5c50656ed0616d37c7.zip
Qt-0b3ca8620fdc66e726a3db5c50656ed0616d37c7.tar.gz
Qt-0b3ca8620fdc66e726a3db5c50656ed0616d37c7.tar.bz2
Merge branch 'buildSystemFixes' into 4.7-s60
Conflicts: mkspecs/features/symbian/symbian_building.prf
Diffstat (limited to 'tests/auto/qscriptengine')
-rw-r--r--tests/auto/qscriptengine/qscriptengine.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qscriptengine/qscriptengine.pro b/tests/auto/qscriptengine/qscriptengine.pro
index 7d0f5d0..fc35f66 100644
--- a/tests/auto/qscriptengine/qscriptengine.pro
+++ b/tests/auto/qscriptengine/qscriptengine.pro
@@ -9,7 +9,7 @@ wince* {
DEFINES += SRCDIR=\\\"$$PWD\\\"
}
-wince*|symbian*: {
+wince*|symbian: {
addFiles.sources = script
addFiles.path = .
DEPLOYMENT += addFiles