summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorPatrick Burke <patrick.burke@nokia.com>2011-07-27 12:15:20 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-27 08:55:57 +0200
commit05f6631ab5a10e8150574011d1a04eb839a56e4c (patch)
treee4969c0e31821564ef0146b9c8afc5c1883f3ec2 /demos
parent501152a9f6bd2a45259a0f5a688f69673a00fa12 (diff)
Tidying up build system removing need for qt3d_pkg_dep.pri.
Change-Id: Ie30bc5e6caa065ba4ef00903f6e468e8c4260715 Reviewed-on: http://codereview.qt.nokia.com/2232 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
Diffstat (limited to 'demos')
-rw-r--r--demos/qt3d/cubehouse/cubehouse.pro2
-rw-r--r--demos/qt3d/pageflip/pageflip.pro2
-rw-r--r--demos/qt3d/photobrowser3d/photobrowser3d.pro2
-rw-r--r--demos/qt3d/shapes/shapes.pro2
-rw-r--r--demos/qt3d/teaservice/teaservice.pro2
5 files changed, 5 insertions, 5 deletions
diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro
index f94e6281b..77e74ac95 100644
--- a/demos/qt3d/cubehouse/cubehouse.pro
+++ b/demos/qt3d/cubehouse/cubehouse.pro
@@ -3,7 +3,7 @@ TARGET = cubehouse
CONFIG += qt warn_on
!package: CONFIG += qt3d
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
include(../../../pkg.pri)
SOURCES = cubeview.cpp main.cpp projectivetextureeffect.cpp
diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro
index 28ea4c16b..fe3aadab2 100644
--- a/demos/qt3d/pageflip/pageflip.pro
+++ b/demos/qt3d/pageflip/pageflip.pro
@@ -8,7 +8,7 @@ SOURCES = pageflip.cpp pageflipmath.cpp
HEADERS = pageflipmath_p.h
RESOURCES = pageflip.qrc
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
include(../../../pkg.pri)
OTHER_FILES += \
diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro
index 7ab4eaa28..bc2c8bff7 100644
--- a/demos/qt3d/photobrowser3d/photobrowser3d.pro
+++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro
@@ -56,7 +56,7 @@ OTHER_FILES += \
shaders/replace_texture.fsh \
shaders/replace_texture.vsh
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
include(../../../pkg.pri)
symbian {
diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro
index e458979a8..f9dd486de 100644
--- a/demos/qt3d/shapes/shapes.pro
+++ b/demos/qt3d/shapes/shapes.pro
@@ -5,7 +5,7 @@ CONFIG += qt warn_on
SOURCES = shapes.cpp
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
include(../../../pkg.pri)
OTHER_FILES += \
diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro
index d9a368834..079750f8d 100644
--- a/demos/qt3d/teaservice/teaservice.pro
+++ b/demos/qt3d/teaservice/teaservice.pro
@@ -9,7 +9,7 @@ SOURCES = teaservice.cpp meshobject.cpp sceneobject.cpp perpixeleffect.cpp
HEADERS = meshobject.h sceneobject.h perpixeleffect.h
RESOURCES = teaservice.qrc
-include(../../../qt3d_pkg_dep.pri)
+CONFIG += qt3d_deploy_pkg
include(../../../pkg.pri)
OTHER_FILES += \