From 6cd786cda077b1d95cb9edecf66213fddecbcda7 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 13 Sep 2010 10:52:19 +0100
Subject: [PATCH] new QML Wizard: move qml files to the right level
By using a function, which we evaluate in the right context we end up
with the project tree we want
---
share/qtcreator/templates/qmlapp/app.pro | 2 ++
.../qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri | 9 +++++++++
2 files changed, 11 insertions(+)
diff --git a/share/qtcreator/templates/qmlapp/app.pro b/share/qtcreator/templates/qmlapp/app.pro
index 25c37cd80c5..be72e26aff4 100644
--- a/share/qtcreator/templates/qmlapp/app.pro
+++ b/share/qtcreator/templates/qmlapp/app.pro
@@ -25,3 +25,5 @@ symbian:ICON = symbianicon.svg
SOURCES += main.cpp
include(qmlapplicationviewer/qmlapplicationviewer.pri)
+
+qtcAddDeployment(DEPLOYMENTFOLDERS)
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
index 0223774ba3c..ac8880ccaee 100644
--- a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -20,6 +20,7 @@ contains(DEFINES, QMLINSPECTOR) {
}
}
+defineTest(qtcAddDeployment) {
for(deploymentfolder, DEPLOYMENTFOLDERS) {
item = item$${deploymentfolder}
itemsources = $${item}.sources
@@ -85,3 +86,11 @@ symbian {
target.path = $${installPrefix}/bin
INSTALLS += desktopfile icon target
}
+
+export (INSTALLS)
+export (DEPLOYMENT)
+export (TARGET.EPOCHEAPSIZE)
+export (TARGET.CAPABILITY)
+export (LIBS)
+export (QMAKE_EXTRA_TARGETS)
+}
--
GitLab