diff options
| author | Patrick Burke <patrick.burke@nokia.com> | 2011-07-27 11:53:08 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-27 07:22:15 +0200 |
| commit | 501152a9f6bd2a45259a0f5a688f69673a00fa12 (patch) | |
| tree | d207daf7632397494b24de5eefa966e1b293e80c /demos | |
| parent | 3f056dc75816736dae570b88abd1f784c530fb50 (diff) | |
Tidying up build system removing need for qt3dquick_pkg_dep.pri.
Change-Id: I97f8cdccecbf015a60f09a85f5e55ecd3f778377
Reviewed-on: http://codereview.qt.nokia.com/2230
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/qt3d/cubehouse/cubehouse.pro | 1 | ||||
| -rw-r--r-- | demos/qt3d/pageflip/pageflip.pro | 1 | ||||
| -rw-r--r-- | demos/qt3d/photobrowser3d/photobrowser3d.pro | 1 | ||||
| -rw-r--r-- | demos/qt3d/shapes/shapes.pro | 1 | ||||
| -rw-r--r-- | demos/qt3d/teaservice/teaservice.pro | 1 | ||||
| -rw-r--r-- | demos/quick3d/model_viewer/model_viewer.pro | 3 | ||||
| -rw-r--r-- | demos/quick3d/robo_bounce/robo_bounce.pro | 3 | ||||
| -rw-r--r-- | demos/quick3d/tea_service/tea_service.pro | 3 |
8 files changed, 9 insertions, 5 deletions
diff --git a/demos/qt3d/cubehouse/cubehouse.pro b/demos/qt3d/cubehouse/cubehouse.pro index c091b465d..f94e6281b 100644 --- a/demos/qt3d/cubehouse/cubehouse.pro +++ b/demos/qt3d/cubehouse/cubehouse.pro @@ -4,6 +4,7 @@ CONFIG += qt warn_on !package: CONFIG += qt3d include(../../../qt3d_pkg_dep.pri) +include(../../../pkg.pri) SOURCES = cubeview.cpp main.cpp projectivetextureeffect.cpp HEADERS = cubeview.h projectivetextureeffect.h diff --git a/demos/qt3d/pageflip/pageflip.pro b/demos/qt3d/pageflip/pageflip.pro index 09aab36cd..28ea4c16b 100644 --- a/demos/qt3d/pageflip/pageflip.pro +++ b/demos/qt3d/pageflip/pageflip.pro @@ -9,6 +9,7 @@ HEADERS = pageflipmath_p.h RESOURCES = pageflip.qrc include(../../../qt3d_pkg_dep.pri) +include(../../../pkg.pri) OTHER_FILES += \ pageflip.rc diff --git a/demos/qt3d/photobrowser3d/photobrowser3d.pro b/demos/qt3d/photobrowser3d/photobrowser3d.pro index 1a73dd46c..7ab4eaa28 100644 --- a/demos/qt3d/photobrowser3d/photobrowser3d.pro +++ b/demos/qt3d/photobrowser3d/photobrowser3d.pro @@ -57,6 +57,7 @@ OTHER_FILES += \ shaders/replace_texture.vsh include(../../../qt3d_pkg_dep.pri) +include(../../../pkg.pri) symbian { symbian-abld|symbian-sbsv2 { diff --git a/demos/qt3d/shapes/shapes.pro b/demos/qt3d/shapes/shapes.pro index af34c1623..e458979a8 100644 --- a/demos/qt3d/shapes/shapes.pro +++ b/demos/qt3d/shapes/shapes.pro @@ -6,6 +6,7 @@ CONFIG += qt warn_on SOURCES = shapes.cpp include(../../../qt3d_pkg_dep.pri) +include(../../../pkg.pri) OTHER_FILES += \ shapes.rc diff --git a/demos/qt3d/teaservice/teaservice.pro b/demos/qt3d/teaservice/teaservice.pro index c80bac640..d9a368834 100644 --- a/demos/qt3d/teaservice/teaservice.pro +++ b/demos/qt3d/teaservice/teaservice.pro @@ -10,6 +10,7 @@ HEADERS = meshobject.h sceneobject.h perpixeleffect.h RESOURCES = teaservice.qrc include(../../../qt3d_pkg_dep.pri) +include(../../../pkg.pri) OTHER_FILES += \ teaservice.rc diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro index 4778ba3cd..20c7fea72 100644 --- a/demos/quick3d/model_viewer/model_viewer.pro +++ b/demos/quick3d/model_viewer/model_viewer.pro @@ -5,8 +5,7 @@ CONFIG += qt warn_on SOURCES += main.cpp -CONFIG += qt3d_deploy_qml -include(../../../qt3dquick_pkg_dep.pri) +CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg include(../../../pkg.pri) symbian { diff --git a/demos/quick3d/robo_bounce/robo_bounce.pro b/demos/quick3d/robo_bounce/robo_bounce.pro index a93711aef..9198ffda8 100644 --- a/demos/quick3d/robo_bounce/robo_bounce.pro +++ b/demos/quick3d/robo_bounce/robo_bounce.pro @@ -5,7 +5,8 @@ CONFIG += qt warn_on SOURCES += main.cpp -include(../../../qt3dquick_pkg_dep.pri) +CONFIG += qt3dquick_deploy_pkg +include(../../../pkg.pri) OTHER_FILES += \ robo_bounce.rc diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro index 6bd165697..b1cb725b7 100644 --- a/demos/quick3d/tea_service/tea_service.pro +++ b/demos/quick3d/tea_service/tea_service.pro @@ -5,8 +5,7 @@ CONFIG += qt warn_on SOURCES += main.cpp -CONFIG += qt3d_deploy_qml -include(../../../qt3dquick_pkg_dep.pri) +CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg include(../../../pkg.pri) OTHER_FILES += \ |