From adc52bf7838bb27dc0cefc77ae5e35216daf7df4 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Thu, 17 Nov 2011 16:09:04 +0100
Subject: [PATCH] Let the Qt Quick Wizard output import QtQuick 1.1 (instead of
1.0)
...and add a comment to change it to QtQuick 1.0 if S60 5th Ed or
Maemo are supposed to be targeted.
Task-Number: QTCREATORBUG-6528
Change-Id: I1936f2a5c9725f34b5a8ad4469465f5e2b645957
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
---
.../qtcreator/templates/qtquickapp/qml/app/qtquick10/main.qml | 3 ++-
src/plugins/qmljseditor/qmlfilewizard.cpp | 3 ++-
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/share/qtcreator/templates/qtquickapp/qml/app/qtquick10/main.qml b/share/qtcreator/templates/qtquickapp/qml/app/qtquick10/main.qml
index 1e61dc4e27f..4e38ee80425 100644
--- a/share/qtcreator/templates/qtquickapp/qml/app/qtquick10/main.qml
+++ b/share/qtcreator/templates/qtquickapp/qml/app/qtquick10/main.qml
@@ -1,4 +1,5 @@
-import QtQuick 1.0
+// import QtQuick 1.0 // to target S60 5th Edition or Maemo 5
+import QtQuick 1.1
Rectangle {
width: 360
diff --git a/src/plugins/qmljseditor/qmlfilewizard.cpp b/src/plugins/qmljseditor/qmlfilewizard.cpp
index d432ad1f72c..d56df45c442 100644
--- a/src/plugins/qmljseditor/qmlfilewizard.cpp
+++ b/src/plugins/qmljseditor/qmlfilewizard.cpp
@@ -66,7 +66,8 @@ QString QmlFileWizard::fileContents(const QString &fileName) const
// str << CppTools::AbstractEditorSupport::licenseTemplate();
// 100:62 is the 'golden ratio'
- str << QLatin1String("import QtQuick 1.0\n")
+ str << QLatin1String("// import QtQuick 1.0 // to target S60 5th Edition or Maemo 5\n")
+ << QLatin1String("import QtQuick 1.1\n")
<< QLatin1String("\n")
<< QLatin1String("Rectangle {\n")
<< QLatin1String(" width: 100\n")
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
index 65dd32143f6..7ca639f2fbd 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -119,7 +119,8 @@ Core::GeneratedFiles QmlProjectApplicationWizard::generateFiles(const QWizard *w
QTextStream out(&contents);
out
- << "import QtQuick 1.0" << endl
+ << "// import QtQuick 1.0 // to target S60 5th Edition or Maemo 5" << endl
+ << "import QtQuick 1.1" << endl
<< endl
<< "Rectangle {" << endl
<< " width: 360" << endl
--
GitLab