summaryrefslogtreecommitdiffstats
path: root/tests/auto/qimagewriter
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-10-07 09:32:30 (GMT)
committeraxis <qt-info@nokia.com>2009-10-07 11:52:09 (GMT)
commit5ce632d3a8354f118225911103628e602559124e (patch)
tree56c1c751b1fa12392953cddbc6215568199a4557 /tests/auto/qimagewriter
parent330dc1e5895a8950615a9bbf26154f5387b023b1 (diff)
downloadQt-5ce632d3a8354f118225911103628e602559124e.zip
Qt-5ce632d3a8354f118225911103628e602559124e.tar.gz
Qt-5ce632d3a8354f118225911103628e602559124e.tar.bz2
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/qimagewriter')
-rw-r--r--tests/auto/qimagewriter/qimagewriter.pro9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/qimagewriter/qimagewriter.pro b/tests/auto/qimagewriter/qimagewriter.pro
index 5a2c908..8da2942 100644
--- a/tests/auto/qimagewriter/qimagewriter.pro
+++ b/tests/auto/qimagewriter/qimagewriter.pro
@@ -13,9 +13,12 @@ wince*: {
} else:symbian* {
addFiles.sources = images\*.*
addFiles.path = images
- imagePlugins.sources = qjpeg.dll qtiff.dll
- imagePlugins.path = imageformats
- DEPLOYMENT += addFiles imagePlugins
+ DEPLOYMENT += addFiles
+ qt_not_deployed {
+ imagePlugins.sources = qjpeg.dll qtiff.dll
+ imagePlugins.path = imageformats
+ DEPLOYMENT += imagePlugins
+ }
} else {
DEFINES += SRCDIR=\\\"$$PWD\\\"
}