Fixes install/uninstall components of pro files.

Change-Id: Ifae6515ccd48bc4129ae941f22b4af5279ec4c4a

9 files changed, 18 insertions, 67 deletions

diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro
index ee81637ff..b4a8a89d3 100644
--- a/tests/manual/animations/animations.pro
+++ b/tests/manual/animations/animations.pro
@@ -33,15 +33,9 @@ symbian {
     }
 }
 
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
+# for make install use in packages		
+distInstalls.files = qml		
+distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET		
 INSTALLS += distInstalls
 
 package {
@@ -53,6 +47,7 @@ package {
         icons.path = /usr/share/themes/base/meegotouch/icons
         INSTALLS += icons applnk
     }
+
+    target.path = $$[QT_INSTALL_BINS]
+    INSTALLS += target
 }
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro
index 27119a8e7..5236cc467 100644
--- a/tests/manual/displaymodel/displaymodel.pro
+++ b/tests/manual/displaymodel/displaymodel.pro
@@ -33,12 +33,6 @@ symbian {
     }
 }
 
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
 # for make install use in packages
 distInstalls.files = qml
 distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro
index d71470e80..ec3178b7f 100644
--- a/tests/manual/model3ds/model3ds.pro
+++ b/tests/manual/model3ds/model3ds.pro
@@ -33,12 +33,6 @@ symbian {
     }
 }
 
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
 # for make install use in packages
 distInstalls.files = qml
 distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro
index 86aa1182d..2357e6f5a 100644
--- a/tests/manual/navigation1/navigation1.pro
+++ b/tests/manual/navigation1/navigation1.pro
@@ -33,12 +33,6 @@ symbian {
     }
 }
 
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
 # for make install use in packages
 distInstalls.files = qml
 distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro
index 744d22b8b..2f0c7cad6 100644
--- a/tests/manual/rotation/rotation.pro
+++ b/tests/manual/rotation/rotation.pro
@@ -33,12 +33,6 @@ symbian {
     }
 }
 
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
 # for make install use in packages
 distInstalls.files = qml
 distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
@@ -53,6 +47,7 @@ package {
         icons.path = /usr/share/themes/base/meegotouch/icons
         INSTALLS += icons applnk
     }
+
+    target.path = $$[QT_INSTALL_BINS]
+    INSTALLS += target
 }
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro
index c2b7bae1a..eed21e1e1 100644
--- a/tests/manual/scaling/scaling.pro
+++ b/tests/manual/scaling/scaling.pro
@@ -33,12 +33,6 @@ symbian {
     }
 }
 
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
 # for make install use in packages
 distInstalls.files = qml
 distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
@@ -53,6 +47,7 @@ package {
         icons.path = /usr/share/themes/base/meegotouch/icons
         INSTALLS += icons applnk
     }
+
+    target.path = $$[QT_INSTALL_BINS]
+    INSTALLS += target
 }
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro
index f3b01f72e..4697698b1 100644
--- a/tests/manual/submesh/submesh.pro
+++ b/tests/manual/submesh/submesh.pro
@@ -33,12 +33,6 @@ symbian {
     }
 }
 
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
 # for make install use in packages
 distInstalls.files = qml
 distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro
index 67fcdc840..8c60644ea 100644
--- a/tests/manual/transformations/transformations.pro
+++ b/tests/manual/transformations/transformations.pro
@@ -33,12 +33,6 @@ symbian {
     }
 }
 
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
 # for make install use in packages
 distInstalls.files = qml
 distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
@@ -53,6 +47,7 @@ package {
         icons.path = /usr/share/themes/base/meegotouch/icons
         INSTALLS += icons applnk
     }
+
+    target.path = $$[QT_INSTALL_BINS]
+    INSTALLS += target
 }
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro
index fc5dad7b8..ce0d21cdd 100644
--- a/tests/manual/translation/translation.pro
+++ b/tests/manual/translation/translation.pro
@@ -33,12 +33,6 @@ symbian {
     }
 }
 
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
 # for make install use in packages
 distInstalls.files = qml
 distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
@@ -53,6 +47,7 @@ package {
         icons.path = /usr/share/themes/base/meegotouch/icons
         INSTALLS += icons applnk
     }
+
+    target.path = $$[QT_INSTALL_BINS]
+    INSTALLS += target
 }
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target