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>

8 files changed, 12 insertions, 45 deletions

diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index 77e74ac95..bf343d7e4 100644
--- a/demos/qt3d/cubehouse/cubehouse.pro
+++ b/demos/qt3d/cubehouse/cubehouse.pro
@@ -1,7 +1,6 @@
 TEMPLATE = app
 TARGET = cubehouse
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
 
 CONFIG += qt3d_deploy_pkg
 include(../../../pkg.pri)
@@ -20,6 +19,3 @@ OTHER_FILES += \
 
 RC_FILE = cubehouse.rc
 
-symbian {
-    ICON = ../qt3d.svg
-}
diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index fe3aadab2..a42d57544 100644
--- a/demos/qt3d/pageflip/pageflip.pro
+++ b/demos/qt3d/pageflip/pageflip.pro
@@ -2,20 +2,15 @@ TEMPLATE = app
 TARGET = pageflip
 CONFIG += qt warn_on
 
-!package: CONFIG += qt3d
+CONFIG += qt3d_deploy_pkg
+include(../../../pkg.pri)
 
 SOURCES = pageflip.cpp pageflipmath.cpp
 HEADERS = pageflipmath_p.h
 RESOURCES = pageflip.qrc
 
-CONFIG += qt3d_deploy_pkg
-include(../../../pkg.pri)
-
 OTHER_FILES += \
     pageflip.rc
 
 RC_FILE = pageflip.rc
 
-symbian {
-    ICON = ../qt3d.svg
-}
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro
index bc2c8bff7..5fc210277 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
@@ -2,9 +2,8 @@ TEMPLATE = app
 TARGET = photobrowser3d
 CONFIG += qt warn_on
 
+CONFIG += qt3d_deploy_pkg
 include(../../../pkg.pri)
-!package: CONFIG += qt3d
-package: QT += opengl
 
 SOURCES += main.cpp\
     photobrowser3dview.cpp \
@@ -56,9 +55,6 @@ OTHER_FILES += \
     shaders/replace_texture.fsh \
     shaders/replace_texture.vsh
 
-CONFIG += qt3d_deploy_pkg
-include(../../../pkg.pri)
-
 symbian {
     symbian-abld|symbian-sbsv2 {
         # ro-section in photobrowser3d can exceed default allocated space, so move rw-section a little further
@@ -71,7 +67,3 @@ OTHER_FILES += \
     photobrowser.rc
 
 RC_FILE = photobrowser.rc
-
-symbian {
-    ICON = ../qt3d.svg
-}
diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro
index f9dd486de..fb53bec48 100644
--- a/demos/qt3d/shapes/shapes.pro
+++ b/demos/qt3d/shapes/shapes.pro
@@ -1,18 +1,13 @@
 TEMPLATE = app
 TARGET = shapes
 CONFIG += qt warn_on
-!package: CONFIG += qt3d
-
-SOURCES = shapes.cpp
 
 CONFIG += qt3d_deploy_pkg
 include(../../../pkg.pri)
 
+SOURCES = shapes.cpp
+
 OTHER_FILES += \
     shapes.rc
 
 RC_FILE = shapes.rc
-
-symbian {
-    ICON = ../qt3d.svg
-}
diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index 079750f8d..f61b6401c 100644
--- a/demos/qt3d/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
@@ -2,21 +2,15 @@ TEMPLATE = app
 TARGET = teaservice
 CONFIG += qt warn_on
 
+CONFIG += qt3d_deploy_pkg
 include(../../../pkg.pri)
-!package: CONFIG += qt3d
 
 SOURCES = teaservice.cpp meshobject.cpp sceneobject.cpp perpixeleffect.cpp
 HEADERS = meshobject.h sceneobject.h perpixeleffect.h
 RESOURCES = teaservice.qrc
 
-CONFIG += qt3d_deploy_pkg
-include(../../../pkg.pri)
-
 OTHER_FILES += \
     teaservice.rc
 
 RC_FILE = teaservice.rc
 
-symbian {
-    ICON = ../qt3d.svg
-}
diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro
index a76edc0cc..96ab797d4 100644
--- a/demos/quick3d/model_viewer/model_viewer.pro
+++ b/demos/quick3d/model_viewer/model_viewer.pro
@@ -1,16 +1,14 @@
 TEMPLATE = app
 TARGET = model_viewer
 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
+
 symbian {
     qmlDeployment2.sources = qml\meshes\*
     qmlDeployment2.path = qml\meshes
diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro
index 9198ffda8..671f2a93a 100644
--- a/demos/quick3d/robo_bounce/robo_bounce.pro
+++ b/demos/quick3d/robo_bounce/robo_bounce.pro
@@ -1,13 +1,12 @@
 TEMPLATE = app
 TARGET = robo_bounce
 CONFIG += qt warn_on
-!package: CONFIG += qt3dquick
-
-SOURCES += main.cpp
 
 CONFIG += qt3dquick_deploy_pkg
 include(../../../pkg.pri)
 
+SOURCES += main.cpp
+
 OTHER_FILES += \
     robo_bounce.rc
 
diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro
index 8dbf953a9..d977a8968 100644
--- a/demos/quick3d/tea_service/tea_service.pro
+++ b/demos/quick3d/tea_service/tea_service.pro
@@ -1,16 +1,14 @@
 TEMPLATE = app
 TARGET = tea_service
 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 += \
     tea_service.rc