feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlWizards: Use 'QtQuick 1.0' namespace

Browse Source 
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
This commit is contained in:
Kai Koehne
2010-11-30 16:23:22 +01:00
committed by con
parent e15e62c348
commit 33d66233b5
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/templates/qmlapp/qml/app/main.qml
View File

@@ -1,4 +1,4 @@
import Qt 4.7 import QtQuick 1.0
Rectangle { Rectangle {
width: 360 width: 360

2
src/plugins/qmljseditor/qmlfilewizard.cpp
View File

@@ -63,7 +63,7 @@ QString QmlFileWizard::fileContents(const QString &fileName) const
// str << CppTools::AbstractEditorSupport::licenseTemplate(); // str << CppTools::AbstractEditorSupport::licenseTemplate();
// 100:62 is the 'golden ratio' // 100:62 is the 'golden ratio'
str << QLatin1String("import Qt 4.7\n") str << QLatin1String("import QtQuick 1.0\n")
<< QLatin1String("\n") << QLatin1String("\n")
<< QLatin1String("Rectangle {\n") << QLatin1String("Rectangle {\n")
<< QLatin1String(" width: 100\n") << QLatin1String(" width: 100\n")

2
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
View File

@@ -114,7 +114,7 @@ Core::GeneratedFiles QmlProjectApplicationWizard::generateFiles(const QWizard *w
QTextStream out(&contents); QTextStream out(&contents);
out out
<< "import Qt 4.7" << endl << "import QtQuick 1.0" << endl
<< endl << endl
<< "Rectangle {" << endl << "Rectangle {" << endl
<< " width: 360" << endl << " width: 360" << endl