summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtextstream
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-10-07 11:32:30 +0200
committeraxis <qt-info@nokia.com>2009-10-07 13:52:09 +0200
commit5ce632d3a8354f118225911103628e602559124e (patch)
tree56c1c751b1fa12392953cddbc6215568199a4557 /tests/auto/qtextstream
parent330dc1e5895a8950615a9bbf26154f5387b023b1 (diff)
Fixed deployment when using cetest.
Cetest (and other programs that upload dlls manually without using a package) need to deploy some plugins for specific tests. If those tests are deployed in a normal package however, the installation will fail because the plugins are already included in the Qt installation. Fixed that by putting the deployment inside a scope that cetest will define. RevBy: Miikka Heikkinen
Diffstat (limited to 'tests/auto/qtextstream')
-rw-r--r--tests/auto/qtextstream/test/test.pro8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/qtextstream/test/test.pro b/tests/auto/qtextstream/test/test.pro
index 9f117d50f8..c70c27bf5d 100644
--- a/tests/auto/qtextstream/test/test.pro
+++ b/tests/auto/qtextstream/test/test.pro
@@ -30,9 +30,11 @@ wince*: {
}else:symbian {
load(data_caging_paths)
# Symbian can't define SRCDIR meaningfully here
- codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll
- codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs
- DEPLOYMENT += codecs_plugins
+ qt_not_deployed {
+ codecs_plugins.sources = qcncodecs.dll qjpcodecs.dll qtwcodecs.dll qkrcodecs.dll
+ codecs_plugins.path = $$QT_PLUGINS_BASE_DIR/codecs
+ DEPLOYMENT += codecs_plugins
+ }
}else {
DEFINES += SRCDIR=\\\"$$PWD/../\\\"
}