summaryrefslogtreecommitdiffstats
path: root/pkg.pri
diff options
context:
space:
mode:
authorPatrick Burke <patrick.burke@nokia.com>2011-08-25 11:23:47 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-25 05:22:09 +0200
commit8733fe5b5d1736a85589e43a16cf1d0ecb366e45 (patch)
tree5339df5cc5852b917d14298c95b887ba11d6aefe /pkg.pri
parentfd1e70a690b46e37c6cd90c31a5b19b2bea28bbb (diff)
Fixing deployment of qml files on linux based systems.
Change-Id: I25fcaee72a1bb44f40c5470dbdeb0d8bafcebf2e Reviewed-on: http://codereview.qt.nokia.com/3538 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Patrick Burke <patrick.burke@nokia.com>
Diffstat (limited to 'pkg.pri')
-rw-r--r--pkg.pri9
1 files changed, 7 insertions, 2 deletions
diff --git a/pkg.pri b/pkg.pri
index f8eb64bd6..43ad83bde 100644
--- a/pkg.pri
+++ b/pkg.pri
@@ -89,7 +89,7 @@ contains(TEMPLATE, app) {
INSTALLS += target
} else {
mt {
- applnk.files = info.json
+ applnk.files = info.json $${TARGET}.qmlproject
applnk.path = /opt/mt/applications/$${TARGET}
# icons.files is set by qt3dquick_pkg_dep.pri or qt3d_pkg_dep.pri
@@ -205,7 +205,7 @@ defineTest(qtcAddDeployment) {
macx {
target = $$DESTDIR/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
} else {
- target = $$DESTDIR/$$eval($${deploymentfolder}.target)
+ target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
}
target = $$replace(target, \\\\, /)
sourcePathSegments = $$split(source, /)
@@ -226,6 +226,11 @@ defineTest(qtcAddDeployment) {
}
}
mt {
+ desktopfile.files = $${TARGET}.qmlproject info.json
+ desktopfile.path = /opt/mt/applications/$$TARGET
+ icon.files = ../icon.png
+ icon.path = /opt/mt/applications/$$TARGET
+
for(deploymentfolder, DEPLOYMENTFOLDERS) {
item = item$${deploymentfolder}
itemfiles = $${item}.files