diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-05 14:55:27 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-08-06 10:46:00 +0300 |
| commit | 64ca5d3ac1dc1b1e82c409cf011d97ca8f76f6ed (patch) | |
| tree | 865d6e7299cbd2d61f883ccbd34f4f89ff67dd83 | |
| parent | 7f59bc3c7f13058e2b8fca076072e99136dd4648 (diff) | |
| download | qt4-tools-64ca5d3ac1dc1b1e82c409cf011d97ca8f76f6ed.tar.gz | |
Fix some autotest deployments to work in case Qt is already deployed
Reviewed-by: Shane Kearns
| -rw-r--r-- | tests/auto/qdom/qdom.pro | 4 | ||||
| -rw-r--r-- | tests/auto/qsvgrenderer/qsvgrenderer.pro | 4 | ||||
| -rw-r--r-- | tests/auto/qtextcodec/test/test.pro | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/tests/auto/qdom/qdom.pro b/tests/auto/qdom/qdom.pro index 5434ada4d8..9040b91d6d 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 { diff --git a/tests/auto/qsvgrenderer/qsvgrenderer.pro b/tests/auto/qsvgrenderer/qsvgrenderer.pro index 8cfbcceed3..0b785e3dfe 100644 --- a/tests/auto/qsvgrenderer/qsvgrenderer.pro +++ b/tests/auto/qsvgrenderer/qsvgrenderer.pro @@ -13,6 +13,8 @@ wince*|symbian { addFiles.path = . DEPLOYMENT += addFiles - DEPLOYMENT_PLUGIN += qsvg + wince*|qt_not_deployed { + DEPLOYMENT_PLUGIN += qsvg + } } diff --git a/tests/auto/qtextcodec/test/test.pro b/tests/auto/qtextcodec/test/test.pro index efa2e856b3..b85032a942 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*: { |