diff options
author | axis <qt-info@nokia.com> | 2009-10-07 09:32:30 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-10-07 11:52:09 (GMT) |
commit | 5ce632d3a8354f118225911103628e602559124e (patch) | |
tree | 56c1c751b1fa12392953cddbc6215568199a4557 /tests/auto/qicon | |
parent | 330dc1e5895a8950615a9bbf26154f5387b023b1 (diff) | |
download | Qt-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/qicon')
-rw-r--r-- | tests/auto/qicon/qicon.pro | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/qicon/qicon.pro b/tests/auto/qicon/qicon.pro index 8ae252f..68b888d 100644 --- a/tests/auto/qicon/qicon.pro +++ b/tests/auto/qicon/qicon.pro @@ -18,9 +18,12 @@ wince* { QT += xml svg addFiles.sources = *.png tst_qicon.cpp *.svg *.svgz addFiles.path = . - plugins.sources = qsvgicon.dll - plugins.path = iconengines - DEPLOYMENT += addFiles plugins + DEPLOYMENT += addFiles + qt_not_deployed { + plugins.sources = qsvgicon.dll + plugins.path = iconengines + DEPLOYMENT += plugins + } } else { DEFINES += SRCDIR=\\\"$$PWD\\\" } |