diff options
| author | Patrick Burke <patrick.burke@nokia.com> | 2011-07-27 11:17:06 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-27 05:42:24 +0200 |
| commit | 3f056dc75816736dae570b88abd1f784c530fb50 (patch) | |
| tree | 3b83834790684a7fcd3b7f487c81d26c001a4023 /tests | |
| parent | e248a12d6ac0e756e6ebab610fb6cf5433d725bc (diff) | |
Tidying up build system removing need for qml_pkg.pri.
Change-Id: Ief07b4656cb676ea74ec389154ffd07dfde50abd
Reviewed-on: http://codereview.qt.nokia.com/2229
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, 20 insertions, 10 deletions
diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro index 7e4cdf02a..86f69fc13 100644 --- a/tests/manual/animations/animations.pro +++ b/tests/manual/animations/animations.pro @@ -5,5 +5,6 @@ CONFIG += qt warn_on SOURCES += main.cpp +CONFIG += qt3d_deploy_qml include(../../../qt3dquick_pkg_dep.pri) -include(../../../qml_pkg.pri) +include(../../../pkg.pri) diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro index 85a9fcbe9..915c70f9c 100644 --- a/tests/manual/displaymodel/displaymodel.pro +++ b/tests/manual/displaymodel/displaymodel.pro @@ -5,5 +5,6 @@ CONFIG += qt warn_on SOURCES += main.cpp +CONFIG += qt3d_deploy_qml include(../../../qt3dquick_pkg_dep.pri) -include(../../../qml_pkg.pri) +include(../../../pkg.pri) diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro index 94acaf63d..f93122dd8 100644 --- a/tests/manual/model3ds/model3ds.pro +++ b/tests/manual/model3ds/model3ds.pro @@ -5,5 +5,6 @@ CONFIG += qt warn_on SOURCES += main.cpp +CONFIG += qt3d_deploy_qml include(../../../qt3dquick_pkg_dep.pri) -include(../../../qml_pkg.pri) +include(../../../pkg.pri) diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro index ae30a596c..b8de29a90 100644 --- a/tests/manual/navigation1/navigation1.pro +++ b/tests/manual/navigation1/navigation1.pro @@ -5,5 +5,6 @@ CONFIG += qt warn_on SOURCES += main.cpp +CONFIG += qt3d_deploy_qml include(../../../qt3dquick_pkg_dep.pri) -include(../../../qml_pkg.pri) +include(../../../pkg.pri) diff --git a/tests/manual/qrc/qrc.pro b/tests/manual/qrc/qrc.pro index bddc5a248..821356129 100644 --- a/tests/manual/qrc/qrc.pro +++ b/tests/manual/qrc/qrc.pro @@ -6,8 +6,9 @@ CONFIG += qt warn_on SOURCES += main.cpp +CONFIG += qt3d_deploy_qml include(../../../qt3dquick_pkg_dep.pri) -include(../../../qml_pkg.pri) +include(../../../pkg.pri) OTHER_FILES += \ qml/tst_cube.qml diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro index edb7deec4..9543f6431 100644 --- a/tests/manual/rotation/rotation.pro +++ b/tests/manual/rotation/rotation.pro @@ -5,5 +5,6 @@ CONFIG += qt warn_on SOURCES += main.cpp +CONFIG += qt3d_deploy_qml include(../../../qt3dquick_pkg_dep.pri) -include(../../../qml_pkg.pri) +include(../../../pkg.pri) diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro index a98d3a2cb..7d9c7e920 100644 --- a/tests/manual/scaling/scaling.pro +++ b/tests/manual/scaling/scaling.pro @@ -5,5 +5,6 @@ CONFIG += qt warn_on SOURCES += main.cpp +CONFIG += qt3d_deploy_qml include(../../../qt3dquick_pkg_dep.pri) -include(../../../qml_pkg.pri) +include(../../../pkg.pri) diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro index d9f4a5f4b..06bbcd678 100644 --- a/tests/manual/submesh/submesh.pro +++ b/tests/manual/submesh/submesh.pro @@ -5,5 +5,6 @@ CONFIG += qt warn_on SOURCES += main.cpp +CONFIG += qt3d_deploy_qml include(../../../qt3dquick_pkg_dep.pri) -include(../../../qml_pkg.pri) +include(../../../pkg.pri) diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro index 7a221d545..362b8f7b9 100644 --- a/tests/manual/transformations/transformations.pro +++ b/tests/manual/transformations/transformations.pro @@ -5,5 +5,6 @@ CONFIG += qt warn_on SOURCES += main.cpp +CONFIG += qt3d_deploy_qml include(../../../qt3dquick_pkg_dep.pri) -include(../../../qml_pkg.pri) +include(../../../pkg.pri) diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro index f6adcab73..867074d22 100644 --- a/tests/manual/translation/translation.pro +++ b/tests/manual/translation/translation.pro @@ -5,5 +5,6 @@ CONFIG += qt warn_on SOURCES += main.cpp +CONFIG += qt3d_deploy_qml include(../../../qt3dquick_pkg_dep.pri) -include(../../../qml_pkg.pri) +include(../../../pkg.pri) |