summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtextcodec/test/test.pro
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2010-08-17 14:00:47 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2010-08-17 14:00:47 (GMT)
commit36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce (patch)
treef65778c976c7ac5f1fa6fb81e8e33982f1fd2e82 /tests/auto/qtextcodec/test/test.pro
parent86c3fed122b8a6e47904d958f8c50fa19e668434 (diff)
parentff6f17c92ad1bfa898bc89a5ccb65361d443c591 (diff)
downloadQt-36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce.zip
Qt-36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce.tar.gz
Qt-36b2b7afa9e27b7a5eb6d31e4ac5c0ae9ff9a9ce.tar.bz2
Merge branch '4.7' into qmldocs
Diffstat (limited to 'tests/auto/qtextcodec/test/test.pro')
-rw-r--r--tests/auto/qtextcodec/test/test.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qtextcodec/test/test.pro b/tests/auto/qtextcodec/test/test.pro
index efa2e85..b85032a 100644
--- a/tests/auto/qtextcodec/test/test.pro
+++ b/tests/auto/qtextcodec/test/test.pro
@@ -20,7 +20,9 @@ wince*|symbian {
addFiles.sources = ../*.txt
addFiles.path = .
DEPLOYMENT += addFiles
- DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs
+ wince*|qt_not_deployed {
+ DEPLOYMENT_PLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs
+ }
}
wince*: {