summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdom
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-08-11 00:09:19 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-08-11 00:09:19 (GMT)
commitc170e75cd3af746cfec80ff7d5feb44228a329c3 (patch)
treea869e64b45ec871dd0a55b0994a14616656dcc86 /tests/auto/qdom
parent4026b2c7bc91f8f25f73b182687d5d2bed823217 (diff)
parent5a438bd30cf7d92309cbff51da523b7faea335f5 (diff)
downloadQt-c170e75cd3af746cfec80ff7d5feb44228a329c3.zip
Qt-c170e75cd3af746cfec80ff7d5feb44228a329c3.tar.gz
Qt-c170e75cd3af746cfec80ff7d5feb44228a329c3.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/qdom')
-rw-r--r--tests/auto/qdom/qdom.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qdom/qdom.pro b/tests/auto/qdom/qdom.pro
index 5434ada..9040b91 100644
--- a/tests/auto/qdom/qdom.pro
+++ b/tests/auto/qdom/qdom.pro
@@ -9,7 +9,9 @@ wince*|symbian: {
addFiles.path = .
DEPLOYMENT += addFiles
- DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs
+ wince*|qt_not_deployed {
+ DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs
+ }
!symbian:DEFINES += SRCDIR=\\\"\\\"
}
else {