From e959967f11aae51bfad127f92892d58c9eecf07f Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Tue, 13 Apr 2010 12:23:12 +0200
Subject: [PATCH] Qml support: Bump version of qml files from Qt 4.6 to Qt 4.7
Reviewed-by: Thomas Hartmann
---
src/plugins/qmljseditor/qmlfilewizard.cpp | 2 +-
.../qmlprojectapplicationwizard.cpp | 2 +-
src/tools/qml/qmldump/main.cpp | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/plugins/qmljseditor/qmlfilewizard.cpp b/src/plugins/qmljseditor/qmlfilewizard.cpp
index 81637c23ba2..8502ad11dc3 100644
--- a/src/plugins/qmljseditor/qmlfilewizard.cpp
+++ b/src/plugins/qmljseditor/qmlfilewizard.cpp
@@ -63,7 +63,7 @@ QString QmlFileWizard::fileContents(const QString &fileName) const
QTextStream str(&contents);
// str << CppTools::AbstractEditorSupport::licenseTemplate();
- str << QLatin1String("import Qt 4.6\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 8719ab08dbd..7bf0620a192 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
@@ -106,7 +106,7 @@ Core::GeneratedFiles QmlProjectApplicationWizard::generateFiles(const QWizard *w
QTextStream out(&contents);
out
- << "import Qt 4.6" << endl
+ << "import Qt 4.7" << endl
<< endl
<< "Rectangle {" << endl
<< " width: 200" << endl
diff --git a/src/tools/qml/qmldump/main.cpp b/src/tools/qml/qmldump/main.cpp
index 4b47f676290..c5ab8257db1 100644
--- a/src/tools/qml/qmldump/main.cpp
+++ b/src/tools/qml/qmldump/main.cpp
@@ -256,10 +256,10 @@ int main(int argc, char *argv[])
{
QByteArray code;
- code += "import Qt 4.6;\n";
- code += "import Qt.widgets 4.6;\n";
+ code += "import Qt 4.7;\n";
+ code += "import Qt.widgets 4.7;\n";
code += "import Qt.multimedia 1.0;\n";
- code += "import Qt.labs.particles 4.6;\n";
+ code += "import Qt.labs.particles 4.7;\n";
code += "import org.webkit 1.0;\n";
code += "Item {}";
QDeclarativeComponent c(engine);
@@ -284,10 +284,10 @@ int main(int argc, char *argv[])
tyName = tyName.mid(tyName.lastIndexOf('/') + 1);
QByteArray code;
- code += "import Qt 4.6;\n";
- code += "import Qt.widgets 4.6;\n";
+ code += "import Qt 4.7;\n";
+ code += "import Qt.widgets 4.7;\n";
code += "import Qt.multimedia 1.0;\n";
- code += "import Qt.labs.particles 4.6;\n";
+ code += "import Qt.labs.particles 4.7;\n";
code += "import org.webkit 1.0;\n";
code += tyName;
code += " {}\n";
--
GitLab