summaryrefslogtreecommitdiffstats
path: root/tests/auto/qsqlerror
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/qsqlerror
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/qsqlerror')
-rw-r--r--tests/auto/qsqlerror/qsqlerror.pro10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/qsqlerror/qsqlerror.pro b/tests/auto/qsqlerror/qsqlerror.pro
index 2eb7934..456f585 100644
--- a/tests/auto/qsqlerror/qsqlerror.pro
+++ b/tests/auto/qsqlerror/qsqlerror.pro
@@ -8,9 +8,11 @@ QT = core sql
SOURCES += tst_qsqlerror.cpp
symbian {
- contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
- sqlite.path = /sys/bin
- sqlite.sources = sqlite3.dll
- DEPLOYMENT += sqlite
+ qt_not_deployed {
+ contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+ sqlite.path = /sys/bin
+ sqlite.sources = sqlite3.dll
+ DEPLOYMENT += sqlite
+ }
}
}