Merge remote branch 'origin/2.1'

Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp

src/plugins/qmljseditor/qmlfilewizard.cpp

@@ -62,11 +62,12 @@ QString QmlFileWizard::fileContents(const QString &fileName) const
     QTextStream str(&contents);
 //    str << CppTools::AbstractEditorSupport::licenseTemplate();
 
+    // 100:62 is the 'golden ratio'
     str << QLatin1String("import Qt 4.7\n")
         << QLatin1String("\n")
         << QLatin1String("Rectangle {\n")
-        << QLatin1String("    width: 640\n")
-        << QLatin1String("    height: 480\n")
+        << QLatin1String("    width: 100\n")
+        << QLatin1String("    height: 62\n")
         << QLatin1String("}\n");
 
     return contents;

src/plugins/qmljseditor/quicktoolbar.cpp

@@ -159,6 +159,13 @@ void QuickToolBar::apply(TextEditor::BaseTextEditorEditable *editor, Document::P
             end = objectBinding->lastSourceLocation().end();
         }
 
+        if (lookupContext.isNull()) {
+            if (name != m_oldType)
+                m_prototypes.clear();
+        }
+
+        m_oldType = name;
+
         m_prototypes.append(name);
 
         int line1;

src/plugins/qmljseditor/quicktoolbar.h

@@ -53,6 +53,7 @@ private:
     bool m_blockWriting;
     QStringList m_propertyOrder;
     QStringList m_prototypes;
+    QString m_oldType;
 };
 
 } //QmlDesigner