Skip to content
Snippets Groups Projects
Commit adc52bf7 authored by Alessandro Portale's avatar Alessandro Portale
Browse files

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


...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: default avatarLeena Miettinen <riitta-leena.miettinen@nokia.com>
parent 5808e457
No related branches found
No related tags found
No related merge requests found
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
......
...@@ -66,7 +66,8 @@ QString QmlFileWizard::fileContents(const QString &fileName) const ...@@ -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")
......
...@@ -119,7 +119,8 @@ Core::GeneratedFiles QmlProjectApplicationWizard::generateFiles(const QWizard *w ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment