Build system refactorings - squashed.

Deployment updates.
Reviewed-on: http://codereview.qt.nokia.com/1732

Deployment updates.
Reviewed-on: http://codereview.qt.nokia.com/1856

More deployment updates.
Reviewed-on: http://codereview.qt.nokia.com/1912

Tidying up build system removing need for qml_pkg.pri.
Reviewed-on: http://codereview.qt.nokia.com/2229

Tidying up build system removing need for qt3dquick_pkg_dep.pri.
Reviewed-on: http://codereview.qt.nokia.com/2230

Tidying up build system removing need for qt3d_pkg_dep.pri.
Reviewed-on: http://codereview.qt.nokia.com/2232

Final major change to cleanup build system.
Should eliminate problems where the "qml" directories aren't
being updated upon rebuilds, and allows easier deployment to
devices via Qt Creator.
Reviewed-on: http://codereview.qt.nokia.com/2247

Change-Id: Iedc926ef421fcb9039833c328cca8b0802b3bd44
Reviewed-on: http://codereview.qt.nokia.com/2494
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

10 files changed, 20 insertions, 10 deletions

diff --git a/examples/qt3d/basket/basket.pro b/examples/qt3d/basket/basket.pro
index 750ee5e1c..384572b99 100644
--- a/examples/qt3d/basket/basket.pro
+++ b/examples/qt3d/basket/basket.pro
@@ -3,7 +3,8 @@ TARGET = basket
 CONFIG += qt warn_on
 !package: CONFIG += qt3d
 
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
+include(../../../pkg.pri)
 
 SOURCES = basketview.cpp main.cpp
 HEADERS = basketview.h basket_data.h
diff --git a/examples/qt3d/builder/builder.pro b/examples/qt3d/builder/builder.pro
index d06ffdfb2..eeb25762f 100644
--- a/examples/qt3d/builder/builder.pro
+++ b/examples/qt3d/builder/builder.pro
@@ -9,7 +9,8 @@ SOURCES = builder.cpp \
 HEADERS = builder.h
 RESOURCES += builder.qrc
 
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
+include(../../../pkg.pri)
 
 OTHER_FILES += \
     builder.rc
diff --git a/examples/qt3d/cube/cube.pro b/examples/qt3d/cube/cube.pro
index 7b2d2877e..d180d7cb4 100644
--- a/examples/qt3d/cube/cube.pro
+++ b/examples/qt3d/cube/cube.pro
@@ -7,7 +7,8 @@ SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
 RESOURCES = cube.qrc
 
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
+include(../../../pkg.pri)
 
 OTHER_FILES += \
     cube.rc
diff --git a/examples/qt3d/cylinder/cylinder.pro b/examples/qt3d/cylinder/cylinder.pro
index a7e90f48a..6c95819bd 100644
--- a/examples/qt3d/cylinder/cylinder.pro
+++ b/examples/qt3d/cylinder/cylinder.pro
@@ -7,7 +7,8 @@ SOURCES = cylinderview.cpp main.cpp
 HEADERS = cylinderview.h
 RESOURCES = cylinder.qrc
 
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
+include(../../../pkg.pri)
 
 OTHER_FILES += \
     cylinder.rc
diff --git a/examples/qt3d/geometry/geometry.pro b/examples/qt3d/geometry/geometry.pro
index 66cbc9484..367ae5dfb 100644
--- a/examples/qt3d/geometry/geometry.pro
+++ b/examples/qt3d/geometry/geometry.pro
@@ -12,7 +12,8 @@ HEADERS = geometryview.h \
     quadplane.h
 RESOURCES = geometry.qrc
 
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
+include(../../../pkg.pri)
 
 OTHER_FILES += \
     geometry.rc
diff --git a/examples/qt3d/graphicsview/graphicsview.pro b/examples/qt3d/graphicsview/graphicsview.pro
index 758957e69..ea5fc7fcd 100644
--- a/examples/qt3d/graphicsview/graphicsview.pro
+++ b/examples/qt3d/graphicsview/graphicsview.pro
@@ -26,7 +26,8 @@ HEADERS = \
 RESOURCES = \
     graphicsview.qrc
 
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
+include(../../../pkg.pri)
 
 OTHER_FILES += \
     graphicsview.rc
diff --git a/examples/qt3d/nesting/nesting.pro b/examples/qt3d/nesting/nesting.pro
index f1b179702..16d43baf6 100644
--- a/examples/qt3d/nesting/nesting.pro
+++ b/examples/qt3d/nesting/nesting.pro
@@ -7,7 +7,8 @@ SOURCES = cubeview.cpp main.cpp
 HEADERS = cubeview.h
 RESOURCES = nesting.qrc
 
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
+include(../../../pkg.pri)
 
 OTHER_FILES += \
     nesting.rc
diff --git a/examples/qt3d/solarsystem/solarsystem.pro b/examples/qt3d/solarsystem/solarsystem.pro
index 71e9e595e..f1f6dea03 100644
--- a/examples/qt3d/solarsystem/solarsystem.pro
+++ b/examples/qt3d/solarsystem/solarsystem.pro
@@ -9,7 +9,8 @@ HEADERS = solarsystem.h
 RESOURCES += solarsystem.qrc
 DEPENDPATH += resources
 
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
+include(../../../pkg.pri)
 
 OTHER_FILES += \
     resources/moon-texture.jpg \
diff --git a/examples/qt3d/tank/tank.pro b/examples/qt3d/tank/tank.pro
index 1f1daef2c..a734e4cdc 100644
--- a/examples/qt3d/tank/tank.pro
+++ b/examples/qt3d/tank/tank.pro
@@ -12,7 +12,8 @@ HEADERS  += tankview.h \
     tank.h \
     quadplane.h
 
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
+include(../../../pkg.pri)
 
 OTHER_FILES += \
     tank.rc
diff --git a/examples/qt3d/teapot/teapot.pro b/examples/qt3d/teapot/teapot.pro
index dbd8de35f..22b79a32f 100644
--- a/examples/qt3d/teapot/teapot.pro
+++ b/examples/qt3d/teapot/teapot.pro
@@ -6,7 +6,8 @@ CONFIG += qt warn_on
 SOURCES = teapotview.cpp main.cpp
 HEADERS = teapotview.h
 
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
+include(../../../pkg.pri)
 
 OTHER_FILES += \
     teapot.rc