Refactor packaging.

Packaging was always not so good. With the arrival of yet another
packaging system to support, with QtSDK and Harmattan, it was overdue
time to refactor the build system.

Factored out all the places where Qt3D and QtQuick3D dependencies were
exactly 3 levels below the source .pro file. This catches all of the
examples and all of the demos, except for the ones in the tutorials
directories. It is fine if those don't appear in packages, since their
main value is in examining them in the IDE, rather than just having a
package run them for you. It also catches both of the import plugins.

Thus we save a huge amount of duplication of packaging information and
can place the Qt SDK Harmattan packaging into a couple of variables in a
new pkg.pri file. The two deps are now in a qt3d_pkg_dep.pri and
qt3dquick_pkg_dep.pri file which include the pkg.pri.

Change-Id: I28de17d7faa5ccf9157afad99471079c0b62ee87
Reviewed-on: http://codereview.qt.nokia.com/1191
Reviewed-by: Sarah Jane Smith

10 files changed, 29 insertions, 424 deletions

diff --git a/tests/manual/animations/animations.pro b/tests/manual/animations/animations.pro
index b4a8a89d3..7e4cdf02a 100644
--- a/tests/manual/animations/animations.pro
+++ b/tests/manual/animations/animations.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_animations
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages		
-distInstalls.files = qml		
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET		
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_animations_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/displaymodel/displaymodel.pro b/tests/manual/displaymodel/displaymodel.pro
index 5236cc467..85a9fcbe9 100644
--- a/tests/manual/displaymodel/displaymodel.pro
+++ b/tests/manual/displaymodel/displaymodel.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_displaymodel
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_submesh_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/model3ds/model3ds.pro b/tests/manual/model3ds/model3ds.pro
index ec3178b7f..94acaf63d 100644
--- a/tests/manual/model3ds/model3ds.pro
+++ b/tests/manual/model3ds/model3ds.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_model3ds
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_submesh_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/navigation1/navigation1.pro b/tests/manual/navigation1/navigation1.pro
index 2357e6f5a..ae30a596c 100644
--- a/tests/manual/navigation1/navigation1.pro
+++ b/tests/manual/navigation1/navigation1.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_navigation1
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_submesh_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/rotation/rotation.pro b/tests/manual/rotation/rotation.pro
index 2f0c7cad6..edb7deec4 100644
--- a/tests/manual/rotation/rotation.pro
+++ b/tests/manual/rotation/rotation.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_rotation
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_rotation_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/scaling/scaling.pro b/tests/manual/scaling/scaling.pro
index eed21e1e1..a98d3a2cb 100644
--- a/tests/manual/scaling/scaling.pro
+++ b/tests/manual/scaling/scaling.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_scaling
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_scaling_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/submesh/submesh.pro b/tests/manual/submesh/submesh.pro
index 4697698b1..d9f4a5f4b 100644
--- a/tests/manual/submesh/submesh.pro
+++ b/tests/manual/submesh/submesh.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_submesh
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_submesh_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/transformations/transformations.pro b/tests/manual/transformations/transformations.pro
index 8c60644ea..7a221d545 100644
--- a/tests/manual/transformations/transformations.pro
+++ b/tests/manual/transformations/transformations.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_transformations
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_transformations_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/manual/translation/translation.pro b/tests/manual/translation/translation.pro
index ce0d21cdd..f6adcab73 100644
--- a/tests/manual/translation/translation.pro
+++ b/tests/manual/translation/translation.pro
@@ -1,53 +1,9 @@
 TEMPLATE = app
 TARGET = tst_translation
 CONFIG += qt warn_on
+!package: CONFIG += qt3dquick
 
 SOURCES += main.cpp
-HEADERS += ../../shared/qmlres.h
 
-QT += declarative
-
-!package:DESTDIR = ../../../bin
-# for cleanup on Windows platforms - avoid deletion prompts
-win32 {
-    QMAKE_DEL_FILE = del /q
-    QMAKE_DEL_DIR = rmdir /s /q
-}
-
-qmlResources.files = qml
-symbian {
-    DEPLOYMENT = qmlResources
-} else {
-    macx {
-        qmlResources.path = Contents/Resources
-        QMAKE_BUNDLE_DATA += qmlResources
-    } else {
-        !package {
-            qmlResources.input = qmlResources.files
-            qmlResources.output = $$OUT_PWD/../../../bin/resources/tests/$$TARGET/qml
-            qmlResources.commands = $$QMAKE_COPY_DIR ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-            qmlResources.CONFIG += no_link_no_clean
-            qmlResources.variable_out = POST_TARGETDEPS
-            QMAKE_EXTRA_COMPILERS += qmlResources
-        }
-    }
-}
-
-# for make install use in packages
-distInstalls.files = qml
-distInstalls.path = $$[QT_INSTALL_DATA]/quick3d/tests/$$TARGET
-INSTALLS += distInstalls
-
-package {
-    maemo {
-        applnk.files = tst_translation_qml.desktop
-        applnk.path = /usr/share/applications
-
-        icons.files = icon-l-qtquick3d.png
-        icons.path = /usr/share/themes/base/meegotouch/icons
-        INSTALLS += icons applnk
-    }
-
-    target.path = $$[QT_INSTALL_BINS]
-    INSTALLS += target
-}
+include(../../../qt3dquick_pkg_dep.pri)
+include(../../../qml_pkg.pri)
diff --git a/tests/tests.pro b/tests/tests.pro
index 6c25dbe4e..24db71db9 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS = auto benchmarks manual
+SUBDIRS = manual
+!package: SUBDIRS += auto benchmarks