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

Let the Qt Quick Wizard output import QtQuick 1.1 (instead of 1.0)

Browse Source 
...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>
This commit is contained in:
Alessandro Portale
2011-11-17 16:09:04 +01:00
parent 5808e45768
commit adc52bf783
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
share/qtcreator/templates/qtquickapp/qml/app/qtquick10/main.qml
View File

@@ -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 { Rectangle {
width: 360 width: 360

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

@@ -66,7 +66,8 @@ 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 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("\n")
<< QLatin1String("Rectangle {\n") << QLatin1String("Rectangle {\n")
<< QLatin1String(" width: 100\n") << QLatin1String(" width: 100\n")

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

@@ -119,7 +119,8 @@ Core::GeneratedFiles QmlProjectApplicationWizard::generateFiles(const QWizard *w
QTextStream out(&contents); QTextStream out(&contents);
out 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 << endl
<< "Rectangle {" << endl << "Rectangle {" << endl
<< " width: 360" << endl << " width: 360" << endl