Multiple fixes to build system.

Fixed harmattan build issues with lack of CONFIG += package flag.
Fixed harmattan lack-of-icons bug.
Fixed multiple inclusions of pkg.pri.
Fixed multiple inclusions of symbian icons.

Change-Id: I6dfb925efa13af39d3a7fbc651743fbd551f840d
Reviewed-on: http://codereview.qt.nokia.com/2315
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>

10 files changed, 20 insertions, 41 deletions

diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro
index 6cda0e12a..dcbc3fd78 100644
--- a/tests/manual/animations/animations.pro
+++ b/tests/manual/animations/animations.pro
@@ -1,12 +1,10 @@
 TEMPLATE = app
 TARGET = tst_animations
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
-
-SOURCES += main.cpp
 
 INSTALL_DIRS = qml
-
 CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
 include(../../../pkg.pri)
 qtcAddDeployment()
+
+SOURCES += main.cpp
diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro
index ea5596f6b..667ab092d 100644
--- a/tests/manual/displaymodel/displaymodel.pro
+++ b/tests/manual/displaymodel/displaymodel.pro
@@ -1,12 +1,10 @@
 TEMPLATE = app
 TARGET = tst_displaymodel
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
-
-SOURCES += main.cpp
 
 INSTALL_DIRS = qml
-
 CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
 include(../../../pkg.pri)
 qtcAddDeployment()
+
+SOURCES += main.cpp
diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro
index cc8f0dc47..bc19365e7 100644
--- a/tests/manual/model3ds/model3ds.pro
+++ b/tests/manual/model3ds/model3ds.pro
@@ -1,12 +1,10 @@
 TEMPLATE = app
 TARGET = tst_model3ds
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
-
-SOURCES += main.cpp
 
 INSTALL_DIRS = qml
-
 CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
 include(../../../pkg.pri)
 qtcAddDeployment()
+
+SOURCES += main.cpp
diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro
index 8cc414403..a1d3bfad6 100644
--- a/tests/manual/navigation1/navigation1.pro
+++ b/tests/manual/navigation1/navigation1.pro
@@ -1,12 +1,10 @@
 TEMPLATE = app
 TARGET = tst_navigation1
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
-
-SOURCES += main.cpp
 
 INSTALL_DIRS = qml
-
 CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
 include(../../../pkg.pri)
 qtcAddDeployment()
+
+SOURCES += main.cpp
diff --git a/tests/manual/qrc/qrc.pro b/tests/manual/qrc/qrc.pro
index 22b16abd1..a17882d74 100644
--- a/tests/manual/qrc/qrc.pro
+++ b/tests/manual/qrc/qrc.pro
@@ -2,16 +2,13 @@ TEMPLATE = app
 TARGET = tst_qrc
 CONFIG += qt warn_on
 
-!package: CONFIG += qt3dquick
-
-SOURCES += main.cpp
-
 INSTALL_DIRS = qml
-
 CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
 include(../../../pkg.pri)
 qtcAddDeployment()
 
+SOURCES += main.cpp
+
 OTHER_FILES += \
     qml/tst_cube.qml
 
diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro
index 35fa91cd5..e806e3f9c 100644
--- a/tests/manual/rotation/rotation.pro
+++ b/tests/manual/rotation/rotation.pro
@@ -1,12 +1,10 @@
 TEMPLATE = app
 TARGET = tst_rotation
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
-
-SOURCES += main.cpp
 
 INSTALL_DIRS = qml
-
 CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
 include(../../../pkg.pri)
 qtcAddDeployment()
+
+SOURCES += main.cpp
diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro
index f2d1cc49d..ad71ce816 100644
--- a/tests/manual/scaling/scaling.pro
+++ b/tests/manual/scaling/scaling.pro
@@ -1,12 +1,10 @@
 TEMPLATE = app
 TARGET = tst_scaling
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
-
-SOURCES += main.cpp
 
 INSTALL_DIRS = qml
-
 CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
 include(../../../pkg.pri)
 qtcAddDeployment()
+
+SOURCES += main.cpp
diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro
index 6b1138cc0..6f39b0107 100644
--- a/tests/manual/submesh/submesh.pro
+++ b/tests/manual/submesh/submesh.pro
@@ -1,12 +1,10 @@
 TEMPLATE = app
 TARGET = tst_submesh
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
-
-SOURCES += main.cpp
 
 INSTALL_DIRS = qml
-
 CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
 include(../../../pkg.pri)
 qtcAddDeployment()
+
+SOURCES += main.cpp
diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro
index a74b4546d..577f43bf5 100644
--- a/tests/manual/transformations/transformations.pro
+++ b/tests/manual/transformations/transformations.pro
@@ -1,12 +1,10 @@
 TEMPLATE = app
 TARGET = tst_transformations
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
-
-SOURCES += main.cpp
 
 INSTALL_DIRS = qml
-
 CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
 include(../../../pkg.pri)
 qtcAddDeployment()
+
+SOURCES += main.cpp
diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro
index e3cd35844..f88fb24a3 100644
--- a/tests/manual/translation/translation.pro
+++ b/tests/manual/translation/translation.pro
@@ -1,12 +1,10 @@
 TEMPLATE = app
 TARGET = tst_translation
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
-
-SOURCES += main.cpp
 
 INSTALL_DIRS = qml
-
 CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
 include(../../../pkg.pri)
 qtcAddDeployment()
+
+SOURCES += main.cpp