summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorPatrick Burke <patrick.burke@nokia.com>2011-07-27 15:51:47 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-28 02:46:33 +0200
commit054904e83de0c48c685a386d05b90d2f3bdf6fca (patch)
tree89f3666bf26be80180a77a1941a7f88c21324a85 /demos
parent05f6631ab5a10e8150574011d1a04eb839a56e4c (diff)
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. Change-Id: I5323ba460bbad395f82341da560e75d35288fea3 Reviewed-on: http://codereview.qt.nokia.com/2247 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'demos')
-rw-r--r--demos/quick3d/model_viewer/model_viewer.pro3
-rw-r--r--demos/quick3d/tea_service/tea_service.pro3
2 files changed, 6 insertions, 0 deletions
diff --git a/demos/quick3d/model_viewer/model_viewer.pro b/demos/quick3d/model_viewer/model_viewer.pro
index 20c7fea72..a76edc0cc 100644
--- a/demos/quick3d/model_viewer/model_viewer.pro
+++ b/demos/quick3d/model_viewer/model_viewer.pro
@@ -5,8 +5,11 @@ CONFIG += qt warn_on
SOURCES += main.cpp
+INSTALL_DIRS = qml
+
CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
include(../../../pkg.pri)
+qtcAddDeployment()
symbian {
qmlDeployment2.sources = qml\meshes\*
diff --git a/demos/quick3d/tea_service/tea_service.pro b/demos/quick3d/tea_service/tea_service.pro
index b1cb725b7..8dbf953a9 100644
--- a/demos/quick3d/tea_service/tea_service.pro
+++ b/demos/quick3d/tea_service/tea_service.pro
@@ -5,8 +5,11 @@ CONFIG += qt warn_on
SOURCES += main.cpp
+INSTALL_DIRS = qml
+
CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg
include(../../../pkg.pri)
+qtcAddDeployment()
OTHER_FILES += \
tea_service.rc