Merge commit 'origin/1.3'

2009-10-14 16:03:12 +02:00
parent 263d559e86 ee324b0b1e
commit fb63b108f5
32 changed files with 797 additions and 632 deletions
--- a/src/plugins/qmlprojectmanager/qmlnewprojectwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlnewprojectwizard.cpp
@@ -233,7 +233,6 @@ Core::GeneratedFiles QmlNewProjectWizard::generateFiles(const QWizard *w,
        << "Rectangle {" << endl
        << "    width: 200" << endl
        << "    height: 200" << endl
-        << "    color: \"white\"" << endl
        << "    Text {" << endl
        << "        text: \"Hello World\"" << endl
        << "        anchors.centerIn: parent" << endl