From 8194d2287db87654cd5db0556293b5aa91d81182 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Mon, 13 Sep 2010 16:49:04 +0200
Subject: [PATCH] Mobile + QML qizard: Fix deployment.
---
share/qtcreator/templates/mobileapp/app.pri | 7 ++++++-
.../qmlapplicationviewer/qmlapplicationviewer.pri | 15 ++++++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/share/qtcreator/templates/mobileapp/app.pri b/share/qtcreator/templates/mobileapp/app.pri
index 00dcfeb781b..d21963907f8 100644
--- a/share/qtcreator/templates/mobileapp/app.pri
+++ b/share/qtcreator/templates/mobileapp/app.pri
@@ -17,9 +17,14 @@ symbian {
desktopfile.path = /usr/share/applications
}
icon.files = $${TARGET}.png
- icon.path = /usr/share/icons/hicolor/64x64
+ icon.path = /usr/share/icons/hicolor/64x64/apps
desktopfile.files = $${TARGET}.desktop
target.path = $${installPrefix}/bin
+ export(icon.files)
+ export(icon.path)
+ export(desktopfile.files)
+ export(desktopfile.path)
+ export(target.path)
INSTALLS += desktopfile icon target
}
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
index ac8880ccaee..6236eaa8959 100644
--- a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -27,6 +27,10 @@ for(deploymentfolder, DEPLOYMENTFOLDERS) {
$$itemsources = $$eval($${deploymentfolder}.source)
itempath = $${item}.path
$$itempath= $$eval($${deploymentfolder}.target)
+ export($$itemsources)
+ export($$itempath)
+ export(first.depends)
+ export(copydeploymentfolders.commands)
DEPLOYMENT += $$item
}
@@ -47,6 +51,8 @@ symbian {
}
copydeploymentfolders.commands = $$copyCommand
first.depends = $(first) copydeploymentfolders
+ export(first.depends)
+ export(copydeploymentfolders.commands)
QMAKE_EXTRA_TARGETS += first copydeploymentfolders
}
} else:unix {
@@ -78,12 +84,19 @@ symbian {
$$itemfiles = $$eval($${deploymentfolder}.source)
itempath = $${item}.path
$$itempath = $${installPrefix}/share/$${TARGET}/$$eval($${deploymentfolder}.target)
+ export($$itemfiles)
+ export($$itempath)
INSTALLS += $$item
}
icon.files = $${TARGET}.png
- icon.path = /usr/share/icons/hicolor/64x64
+ icon.path = /usr/share/icons/hicolor/64x64/apps
desktopfile.files = $${TARGET}.desktop
target.path = $${installPrefix}/bin
+ export(icon.files)
+ export(icon.path)
+ export(desktopfile.files)
+ export(desktopfile.path)
+ export(target.path)
INSTALLS += desktopfile icon target
}
--
GitLab