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

19 files changed, 115 insertions, 70 deletions

diff --git a/tests/auto/qicoimageformat/qicoimageformat.pro b/tests/auto/qicoimageformat/qicoimageformat.pro
index c0aa4b5ca6..b9c8622de1 100644
--- a/tests/auto/qicoimageformat/qicoimageformat.pro
+++ b/tests/auto/qicoimageformat/qicoimageformat.pro
@@ -15,9 +15,12 @@ wince*: {
 } else:symbian* {
    addFiles.sources = icons
    addFiles.path = .
-   addPlugins.sources = qico.dll
-   addPlugins.path = imageformats
-   DEPLOYMENT += addFiles addPlugins
+   DEPLOYMENT += addFiles
+   qt_not_deployed {
+      addPlugins.sources = qico.dll
+      addPlugins.path = imageformats
+      DEPLOYMENT += addPlugins
+   }
    TARGET.UID3 = 0xE0340004
    DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
 } else {
diff --git a/tests/auto/qicon/qicon.pro b/tests/auto/qicon/qicon.pro
index 8ae252f8e4..68b888dab4 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\\\"
 }
diff --git a/tests/auto/qimage/qimage.pro b/tests/auto/qimage/qimage.pro
index 69d6f0f414..3e0bd692df 100644
--- a/tests/auto/qimage/qimage.pro
+++ b/tests/auto/qimage/qimage.pro
@@ -10,9 +10,12 @@ wince*: {
    TARGET.EPOCHEAPSIZE = 0x200000 0x800000
    addImages.sources = images/*
    addImages.path = images
-   imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll qtiff.dll qico.dll
-   imagePlugins.path = imageformats
-   DEPLOYMENT += addImages imagePlugins
+   DEPLOYMENT += addImages
+   qt_not_deployed {
+      imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll qtiff.dll qico.dll
+      imagePlugins.path = imageformats
+      DEPLOYMENT += imagePlugins
+   }
 } else {
    contains(QT_CONFIG, qt3support): QT += qt3support
    DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/qimagereader/qimagereader.pro b/tests/auto/qimagereader/qimagereader.pro
index 31a9b0f011..5b061b0e31 100644
--- a/tests/auto/qimagereader/qimagereader.pro
+++ b/tests/auto/qimagereader/qimagereader.pro
@@ -30,8 +30,12 @@ symbian*: {
     images.sources = images
     images.path = .
 
-    imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll
-    imagePlugins.path = imageformats
+    DEPLOYMENT += images
 
-    DEPLOYMENT += images imagePlugins
+    qt_not_deployed {
+        imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll
+        imagePlugins.path = imageformats
+
+        DEPLOYMENT += imagePlugins
+    }
 }
diff --git a/tests/auto/qimagewriter/qimagewriter.pro b/tests/auto/qimagewriter/qimagewriter.pro
index 5a2c9088bd..8da2942048 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\\\"
 }
diff --git a/tests/auto/qitemmodel/qitemmodel.pro b/tests/auto/qitemmodel/qitemmodel.pro
index eb62b244cc..2d0bdea79f 100644
--- a/tests/auto/qitemmodel/qitemmodel.pro
+++ b/tests/auto/qitemmodel/qitemmodel.pro
@@ -16,9 +16,11 @@ QT += sql
 
 symbian {
     TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb"
-    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
+        }
     }
 }
diff --git a/tests/auto/qmovie/qmovie.pro b/tests/auto/qmovie/qmovie.pro
index 15f0c833bd..30e5901d7c 100644
--- a/tests/auto/qmovie/qmovie.pro
+++ b/tests/auto/qmovie/qmovie.pro
@@ -18,7 +18,9 @@ symbian*: {
    addFiles.path = animations
    DEPLOYMENT += addFiles
 
-   imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll
-   imagePlugins.path = imageformats
-   DEPLOYMENT += imagePlugins
-}
\ No newline at end of file
+   qt_not_deployed {
+      imagePlugins.sources = qjpeg.dll qgif.dll qmng.dll
+      imagePlugins.path = imageformats
+      DEPLOYMENT += imagePlugins
+   }
+}
diff --git a/tests/auto/qsql/qsql.pro b/tests/auto/qsql/qsql.pro
index 167a38d2e2..0ec581d71c 100644
--- a/tests/auto/qsql/qsql.pro
+++ b/tests/auto/qsql/qsql.pro
@@ -10,9 +10,11 @@ wince*: {
 }
 
 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
+        }
     }
 }
diff --git a/tests/auto/qsqldatabase/qsqldatabase.pro b/tests/auto/qsqldatabase/qsqldatabase.pro
index 964c8c95a0..6381219696 100644
--- a/tests/auto/qsqldatabase/qsqldatabase.pro
+++ b/tests/auto/qsqldatabase/qsqldatabase.pro
@@ -23,10 +23,12 @@ symbian {
 	TARGET.EPOCHEAPSIZE=5000 5000000
 	TARGET.EPOCSTACKSIZE=50000
 
-    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
+        }
     }
 }
 
diff --git a/tests/auto/qsqldriver/qsqldriver.pro b/tests/auto/qsqldriver/qsqldriver.pro
index 7f289a6720..d04ca83560 100644
--- a/tests/auto/qsqldriver/qsqldriver.pro
+++ b/tests/auto/qsqldriver/qsqldriver.pro
@@ -17,9 +17,11 @@ wince*: {
 }
 
 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
+        }
     }
 }
diff --git a/tests/auto/qsqlerror/qsqlerror.pro b/tests/auto/qsqlerror/qsqlerror.pro
index 2eb79347f9..456f58529f 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
+        }
     }
 }
diff --git a/tests/auto/qsqlfield/qsqlfield.pro b/tests/auto/qsqlfield/qsqlfield.pro
index 6e5b4613bb..733985461e 100644
--- a/tests/auto/qsqlfield/qsqlfield.pro
+++ b/tests/auto/qsqlfield/qsqlfield.pro
@@ -4,10 +4,12 @@ SOURCES  += tst_qsqlfield.cpp
 QT += sql
 
 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
+        }
     }
 }
 
diff --git a/tests/auto/qsqlquery/qsqlquery.pro b/tests/auto/qsqlquery/qsqlquery.pro
index 494ca4ca59..97646ede90 100644
--- a/tests/auto/qsqlquery/qsqlquery.pro
+++ b/tests/auto/qsqlquery/qsqlquery.pro
@@ -15,9 +15,11 @@ wince*: {
 }
 
 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
+        }
     }
 }
diff --git a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
index cd8586c673..cda8cabf10 100644
--- a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
+++ b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
@@ -7,10 +7,12 @@ wince*: {
    DEPLOYMENT_PLUGIN += qsqlite
 	LIBS += -lws2
 }else: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
+        }
     }
 } else {
    win32:LIBS += -lws2_32
diff --git a/tests/auto/qsqlrecord/qsqlrecord.pro b/tests/auto/qsqlrecord/qsqlrecord.pro
index 67e8ab9c64..7a720757c5 100644
--- a/tests/auto/qsqlrecord/qsqlrecord.pro
+++ b/tests/auto/qsqlrecord/qsqlrecord.pro
@@ -2,10 +2,13 @@ load(qttest_p4)
 SOURCES  += tst_qsqlrecord.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
+        }
+    }
 }
 
 TARGET.EPOCSTACKSIZE=50000
diff --git a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
index 2fddd0345a..ee4f2f08c3 100644
--- a/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
+++ b/tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
@@ -9,10 +9,12 @@ wince*: {
    DEPLOYMENT += plugFiles
    LIBS += -lws2
 }else: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
+        }
     }
 } else {
    win32-g++ {
diff --git a/tests/auto/qsqltablemodel/qsqltablemodel.pro b/tests/auto/qsqltablemodel/qsqltablemodel.pro
index a046fb16aa..9a23237d0d 100644
--- a/tests/auto/qsqltablemodel/qsqltablemodel.pro
+++ b/tests/auto/qsqltablemodel/qsqltablemodel.pro
@@ -9,10 +9,12 @@ wince*: {
    DEPLOYMENT += plugFiles
    LIBS += -lws2
 }else: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
+        }
     }
 }else {
    win32:LIBS += -lws2_32
diff --git a/tests/auto/qsqlthread/qsqlthread.pro b/tests/auto/qsqlthread/qsqlthread.pro
index 2708f1a805..5522232bac 100644
--- a/tests/auto/qsqlthread/qsqlthread.pro
+++ b/tests/auto/qsqlthread/qsqlthread.pro
@@ -10,10 +10,12 @@ wince*: {
    DEPLOYMENT += plugFiles
    LIBS += -lws2
 }else: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
+        }
     }
 }else {
    win32:LIBS += -lws2_32
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/../\\\"
 }