From fefc6cfe6dec8794cafaee6d5fd3e320fe2aad7d Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Wed, 6 Oct 2010 13:35:28 +0200
Subject: [PATCH] Using import Qt 4.7 (again)
We have to support the N900
Reviewed-by: dt
---
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 b41cc09f187..42136251dc1 100644
--- a/share/qtcreator/templates/qmlapp/qml/app/main.qml
+++ b/share/qtcreator/templates/qmlapp/qml/app/main.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import Qt 4.7
Rectangle {
width: 200
diff --git a/src/plugins/qmljseditor/qmlfilewizard.cpp b/src/plugins/qmljseditor/qmlfilewizard.cpp
index 4829b4c1380..3687f5ef3b3 100644
--- a/src/plugins/qmljseditor/qmlfilewizard.cpp
+++ b/src/plugins/qmljseditor/qmlfilewizard.cpp
@@ -62,7 +62,7 @@ QString QmlFileWizard::fileContents(const QString &fileName) const
QTextStream str(&contents);
// str << CppTools::AbstractEditorSupport::licenseTemplate();
- str << QLatin1String("import QtQuick 1.0\n")
+ str << QLatin1String("import Qt 4.7\n")
<< QLatin1String("\n")
<< QLatin1String("Rectangle {\n")
<< QLatin1String(" width: 640\n")
diff --git a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
index 7d3b44f1d96..c58241c2c89 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 QtQuick 1.0" << endl
+ << "import Qt 4.7" << endl
<< endl
<< "Rectangle {" << endl
<< " width: 200" << endl
--
GitLab