From 33d66233b57a0f02d7fbbf5fc6cf100f36a8be6e Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 30 Nov 2010 16:23:22 +0100
Subject: [PATCH] QmlWizards: Use 'QtQuick 1.0' namespace
Use the 'QtQuick 1.0' namespace introduced in 4.7.1. This makes them in
line with the examples/demos we ship in the SDK, but breaks for 4.7.0
(e.g. N900).
Task-number: QTCREATORBUG-3243
---
share/qtcreator/templates/qmlapp/qml/app/main.qml | 2 +-
src/plugins/qmljseditor/qmlfilewizard.cpp | 2 +-
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/share/qtcreator/templates/qmlapp/qml/app/main.qml b/share/qtcreator/templates/qmlapp/qml/app/main.qml
index 4ef3a885a1e..a01ab8c41f1 100644
--- a/share/qtcreator/templates/qmlapp/qml/app/main.qml
+++ b/share/qtcreator/templates/qmlapp/qml/app/main.qml
@@ -1,4 +1,4 @@
-import Qt 4.7
+import QtQuick 1.0
Rectangle {
width: 360
diff --git a/src/plugins/qmljseditor/qmlfilewizard.cpp b/src/plugins/qmljseditor/qmlfilewizard.cpp
index 31918e7ec43..5a8278aa254 100644
--- a/src/plugins/qmljseditor/qmlfilewizard.cpp
+++ b/src/plugins/qmljseditor/qmlfilewizard.cpp
@@ -63,7 +63,7 @@ QString QmlFileWizard::fileContents(const QString &fileName) const
// str << CppTools::AbstractEditorSupport::licenseTemplate();
// 100:62 is the 'golden ratio'
- str << QLatin1String("import Qt 4.7\n")
+ str << QLatin1String("import QtQuick 1.0\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 f59d6c202bf..6c5a072798b 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -114,7 +114,7 @@ Core::GeneratedFiles QmlProjectApplicationWizard::generateFiles(const QWizard *w
QTextStream out(&contents);
out
- << "import Qt 4.7" << endl
+ << "import QtQuick 1.0" << endl
<< endl
<< "Rectangle {" << endl
<< " width: 360" << endl
--
GitLab