diff options
| author | Patrick Burke <patrick.burke@nokia.com> | 2011-07-27 15:51:47 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-28 02:46:33 +0200 |
| commit | 054904e83de0c48c685a386d05b90d2f3bdf6fca (patch) | |
| tree | 89f3666bf26be80180a77a1941a7f88c21324a85 /tests | |
| parent | 05f6631ab5a10e8150574011d1a04eb839a56e4c (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 'tests')
| -rw-r--r-- | tests/manual/animations/animations.pro | 3 | ||||
| -rw-r--r-- | tests/manual/displaymodel/displaymodel.pro | 3 | ||||
| -rw-r--r-- | tests/manual/model3ds/model3ds.pro | 3 | ||||
| -rw-r--r-- | tests/manual/navigation1/navigation1.pro | 3 | ||||
| -rw-r--r-- | tests/manual/qrc/qrc.pro | 3 | ||||
| -rw-r--r-- | tests/manual/rotation/rotation.pro | 3 | ||||
| -rw-r--r-- | tests/manual/scaling/scaling.pro | 3 | ||||
| -rw-r--r-- | tests/manual/submesh/submesh.pro | 3 | ||||
| -rw-r--r-- | tests/manual/transformations/transformations.pro | 3 | ||||
| -rw-r--r-- | tests/manual/translation/translation.pro | 3 |
10 files changed, 30 insertions, 0 deletions
diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro index 848cc78ed..6cda0e12a 100644 --- a/tests/manual/animations/animations.pro +++ b/tests/manual/animations/animations.pro @@ -5,5 +5,8 @@ CONFIG += qt warn_on SOURCES += main.cpp +INSTALL_DIRS = qml + CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg include(../../../pkg.pri) +qtcAddDeployment() diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro index 3ed835cbc..ea5596f6b 100644 --- a/tests/manual/displaymodel/displaymodel.pro +++ b/tests/manual/displaymodel/displaymodel.pro @@ -5,5 +5,8 @@ CONFIG += qt warn_on SOURCES += main.cpp +INSTALL_DIRS = qml + CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg include(../../../pkg.pri) +qtcAddDeployment() diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro index 3d1cb8164..cc8f0dc47 100644 --- a/tests/manual/model3ds/model3ds.pro +++ b/tests/manual/model3ds/model3ds.pro @@ -5,5 +5,8 @@ CONFIG += qt warn_on SOURCES += main.cpp +INSTALL_DIRS = qml + CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg include(../../../pkg.pri) +qtcAddDeployment() diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro index c6754acf4..8cc414403 100644 --- a/tests/manual/navigation1/navigation1.pro +++ b/tests/manual/navigation1/navigation1.pro @@ -5,5 +5,8 @@ CONFIG += qt warn_on SOURCES += main.cpp +INSTALL_DIRS = qml + CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg include(../../../pkg.pri) +qtcAddDeployment() diff --git a/tests/manual/qrc/qrc.pro b/tests/manual/qrc/qrc.pro index 53529e8d8..22b16abd1 100644 --- a/tests/manual/qrc/qrc.pro +++ b/tests/manual/qrc/qrc.pro @@ -6,8 +6,11 @@ CONFIG += qt warn_on SOURCES += main.cpp +INSTALL_DIRS = qml + CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg include(../../../pkg.pri) +qtcAddDeployment() OTHER_FILES += \ qml/tst_cube.qml diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro index ba24455e4..35fa91cd5 100644 --- a/tests/manual/rotation/rotation.pro +++ b/tests/manual/rotation/rotation.pro @@ -5,5 +5,8 @@ CONFIG += qt warn_on SOURCES += main.cpp +INSTALL_DIRS = qml + CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg include(../../../pkg.pri) +qtcAddDeployment() diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro index 19fd8eccd..f2d1cc49d 100644 --- a/tests/manual/scaling/scaling.pro +++ b/tests/manual/scaling/scaling.pro @@ -5,5 +5,8 @@ CONFIG += qt warn_on SOURCES += main.cpp +INSTALL_DIRS = qml + CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg include(../../../pkg.pri) +qtcAddDeployment() diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro index 01007a380..6b1138cc0 100644 --- a/tests/manual/submesh/submesh.pro +++ b/tests/manual/submesh/submesh.pro @@ -5,5 +5,8 @@ CONFIG += qt warn_on SOURCES += main.cpp +INSTALL_DIRS = qml + CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg include(../../../pkg.pri) +qtcAddDeployment() diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro index 33572403e..a74b4546d 100644 --- a/tests/manual/transformations/transformations.pro +++ b/tests/manual/transformations/transformations.pro @@ -5,5 +5,8 @@ CONFIG += qt warn_on SOURCES += main.cpp +INSTALL_DIRS = qml + CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg include(../../../pkg.pri) +qtcAddDeployment() diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro index ed79e088c..e3cd35844 100644 --- a/tests/manual/translation/translation.pro +++ b/tests/manual/translation/translation.pro @@ -5,5 +5,8 @@ CONFIG += qt warn_on SOURCES += main.cpp +INSTALL_DIRS = qml + CONFIG += qt3d_deploy_qml qt3dquick_deploy_pkg include(../../../pkg.pri) +qtcAddDeployment() |