From 043cf532ecac1a3a69dd6af356e638012dc232ec Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Sat, 2 Oct 2010 18:26:51 +0200
Subject: [PATCH] Improved the comments in the generate qml app code.
This was committed to the master branch, but was supposed
to go into 2.1 (I misunderstood the branching strategy of
Creator 2.1).
Since this does not change Creator code:
Reviewed-by: Trustme
---
share/qtcreator/templates/qmlapp/app.pro | 3 ++-
.../qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri | 2 +-
share/qtcreator/templates/shared/deployment.pri | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/share/qtcreator/templates/qmlapp/app.pro b/share/qtcreator/templates/qmlapp/app.pro
index e893e8e3c20..d441773ecd0 100644
--- a/share/qtcreator/templates/qmlapp/app.pro
+++ b/share/qtcreator/templates/qmlapp/app.pro
@@ -27,9 +27,10 @@ symbian:ICON = symbianicon.svg
#DEFINES += QMLJSDEBUGGER
#DEFINES += QMLOBSERVER
+# The .cpp file which was generated for your project. Feel free to hack it.
SOURCES += main.cpp
+# Please do not modify the following three lines. Required for deployment.
include(qmlapplicationviewer/qmlapplicationviewer.pri)
include(../shared/deployment.pri)
-
qtcAddDeployment()
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
index aa172906eb6..319587d7821 100644
--- a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -1,5 +1,5 @@
# This file should not be edited.
-# Following versions of Qt Creator might offer new version.
+# Future versions of Qt Creator might offer updated versions of this file.
QT += declarative
diff --git a/share/qtcreator/templates/shared/deployment.pri b/share/qtcreator/templates/shared/deployment.pri
index 77a0d84fda7..bb79115aafc 100644
--- a/share/qtcreator/templates/shared/deployment.pri
+++ b/share/qtcreator/templates/shared/deployment.pri
@@ -1,5 +1,5 @@
# This file should not be edited.
-# Following versions of Qt Creator might offer new version.
+# Future versions of Qt Creator might offer updated versions of this file.
defineTest(qtcAddDeployment) {
for(deploymentfolder, DEPLOYMENTFOLDERS) {
--
GitLab