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

Qml support: Bump version of qml files from Qt 4.6 to Qt 4.7

Browse Source 
Reviewed-by: Thomas Hartmann
This commit is contained in:
Kai Koehne
2010-04-13 12:23:12 +02:00
parent 559ac20680
commit e959967f11
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,7 +63,7 @@ QString QmlFileWizard::fileContents(const QString &fileName) const
QTextStream str(&contents); QTextStream str(&contents);
// str << CppTools::AbstractEditorSupport::licenseTemplate(); // str << CppTools::AbstractEditorSupport::licenseTemplate();
str << QLatin1String("import Qt 4.6\n") str << QLatin1String("import Qt 4.7\n")
<< QLatin1String("\n") << QLatin1String("\n")
<< QLatin1String("Rectangle {\n") << QLatin1String("Rectangle {\n")
<< QLatin1String(" width: 640\n") << QLatin1String(" width: 640\n")

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

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

12
src/tools/qml/qmldump/main.cpp
View File

@@ -256,10 +256,10 @@ int main(int argc, char *argv[])
{ {
QByteArray code; QByteArray code;
code += "import Qt 4.6;\n"; code += "import Qt 4.7;\n";
code += "import Qt.widgets 4.6;\n"; code += "import Qt.widgets 4.7;\n";
code += "import Qt.multimedia 1.0;\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 += "import org.webkit 1.0;\n";
code += "Item {}"; code += "Item {}";
QDeclarativeComponent c(engine); QDeclarativeComponent c(engine);
@@ -284,10 +284,10 @@ int main(int argc, char *argv[])
tyName = tyName.mid(tyName.lastIndexOf('/') + 1); tyName = tyName.mid(tyName.lastIndexOf('/') + 1);
QByteArray code; QByteArray code;
code += "import Qt 4.6;\n"; code += "import Qt 4.7;\n";
code += "import Qt.widgets 4.6;\n"; code += "import Qt.widgets 4.7;\n";
code += "import Qt.multimedia 1.0;\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 += "import org.webkit 1.0;\n";
code += tyName; code += tyName;
code += " {}\n"; code += " {}\n";