diff options
| -rw-r--r-- | examples/quick3d/cube/cube.pro | 3 | ||||
| -rw-r--r-- | examples/quick3d/cube/cube_qml.qmlproject | 4 | ||||
| -rw-r--r-- | examples/quick3d/cube/info.json | 2 | ||||
| -rw-r--r-- | pkg.pri | 17 |
4 files changed, 15 insertions, 11 deletions
diff --git a/examples/quick3d/cube/cube.pro b/examples/quick3d/cube/cube.pro index b4a57ceed..fb17b958d 100644 --- a/examples/quick3d/cube/cube.pro +++ b/examples/quick3d/cube/cube.pro @@ -6,6 +6,7 @@ CONFIG += qt warn_on SOURCES += main.cpp INSTALL_DIRS = qml +INSTALL_FILES = mt.qml CONFIG += qt3d_deploy_qml include(../../../pkg.pri) @@ -14,6 +15,4 @@ qtcAddDeployment() OTHER_FILES += \ cube_qml.rc -mt: OTHER_FILES += mt.qml - RC_FILE = cube_qml.rc diff --git a/examples/quick3d/cube/cube_qml.qmlproject b/examples/quick3d/cube/cube_qml.qmlproject index 640c64804..37c467f13 100644 --- a/examples/quick3d/cube/cube_qml.qmlproject +++ b/examples/quick3d/cube/cube_qml.qmlproject @@ -3,10 +3,10 @@ import QmlProject 1.0 Project { /* Include .qml, .js, and image files from current directory and subdirectories */ QmlFiles { - directory: [".", "qml"] + directory: "." } JavaScriptFiles { - directory: [".", "qml"] + directory: "." } ImageFiles { directory: "." diff --git a/examples/quick3d/cube/info.json b/examples/quick3d/cube/info.json index b17f01e51..1c2849363 100644 --- a/examples/quick3d/cube/info.json +++ b/examples/quick3d/cube/info.json @@ -5,7 +5,7 @@ "Runtime": "qml", "DisplayName": "Cube_QML", "Subcategory": "utility", - "MainQML": "qml/cube.qml", + "MainQML": "mt.qml", "Version": "1.0", "Identifier": "com.nokia.quick3d.cube_qml", "Depends": { @@ -85,8 +85,8 @@ contains(TEMPLATE, app) { icons.path = /usr/share/themes/base/meegotouch/icons INSTALLS += icons applnk - target.path += $$QT3D_INSTALL_BINS - INSTALLS += target + app_target.path += $$QT3D_INSTALL_BINS + INSTALLS += app_target } else { mt { applnk.files = info.json $${TARGET}.qmlproject @@ -95,13 +95,13 @@ contains(TEMPLATE, app) { # icons.files is set by qt3dquick_pkg_dep.pri or qt3d_pkg_dep.pri icons.path = /opt/mt/applications/$${TARGET} INSTALLS += icons applnk - target.path += /opt/mt/applications/$${TARGET} - INSTALLS += target + app_target.path += /opt/mt/applications/$${TARGET} + INSTALLS += app_target DEFINES += QT3D_USE_OPT=$${TARGET} } else { - target.path += $$QT3D_INSTALL_BINS - INSTALLS += target + app_target.path += $$QT3D_INSTALL_BINS + INSTALLS += app_target } } } else { @@ -133,6 +133,11 @@ qt3d_deploy_qml { di.target = $$TARGET_DIR DEPLOYMENTFOLDERS += di } + for(file, INSTALL_FILES) { + fi.source = $${file} + fi.target = $$TARGET_DIR + DEPLOYMENTFOLDERS += fi + } } # The following code was generated by the Qt Quick Application wizard of Qt Creator. |