diff options
author | Patrick Burke <patrick.burke@nokia.com> | 2011-08-30 16:20:20 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-30 08:24:39 +0200 |
commit | d446274479054090b49336c337e1cc9ff88c403f (patch) | |
tree | b494e6792f3f8b535aa3dbc7f03e3c223f3ce491 /pkg.pri | |
parent | b8cafab981d7f14846d705487e65b7b8d6002bed (diff) |
Remove deployment errors.
Change-Id: Ib6f8ae2d6f60aeb46ea4a566edaf6813514caf4c
Reviewed-on: http://codereview.qt.nokia.com/3845
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
Diffstat (limited to 'pkg.pri')
-rw-r--r-- | pkg.pri | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -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. |