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 /tests | |
| 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 '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, 10 insertions, 20 deletions
diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro index 86f69fc13..848cc78ed 100644 --- a/tests/manual/animations/animations.pro +++ b/tests/manual/animations/animations.pro @@ -5,6 +5,5 @@ 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) diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro index 915c70f9c..3ed835cbc 100644 --- a/tests/manual/displaymodel/displaymodel.pro +++ b/tests/manual/displaymodel/displaymodel.pro @@ -5,6 +5,5 @@ 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) diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro index f93122dd8..3d1cb8164 100644 --- a/tests/manual/model3ds/model3ds.pro +++ b/tests/manual/model3ds/model3ds.pro @@ -5,6 +5,5 @@ 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) diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro index b8de29a90..c6754acf4 100644 --- a/tests/manual/navigation1/navigation1.pro +++ b/tests/manual/navigation1/navigation1.pro @@ -5,6 +5,5 @@ 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) diff --git a/tests/manual/qrc/qrc.pro b/tests/manual/qrc/qrc.pro index 821356129..53529e8d8 100644 --- a/tests/manual/qrc/qrc.pro +++ b/tests/manual/qrc/qrc.pro @@ -6,8 +6,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 += \ diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro index 9543f6431..ba24455e4 100644 --- a/tests/manual/rotation/rotation.pro +++ b/tests/manual/rotation/rotation.pro @@ -5,6 +5,5 @@ 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) diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro index 7d9c7e920..19fd8eccd 100644 --- a/tests/manual/scaling/scaling.pro +++ b/tests/manual/scaling/scaling.pro @@ -5,6 +5,5 @@ 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) diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro index 06bbcd678..01007a380 100644 --- a/tests/manual/submesh/submesh.pro +++ b/tests/manual/submesh/submesh.pro @@ -5,6 +5,5 @@ 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) diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro index 362b8f7b9..33572403e 100644 --- a/tests/manual/transformations/transformations.pro +++ b/tests/manual/transformations/transformations.pro @@ -5,6 +5,5 @@ 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) diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro index 867074d22..ed79e088c 100644 --- a/tests/manual/translation/translation.pro +++ b/tests/manual/translation/translation.pro @@ -5,6 +5,5 @@ 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) |