Merge remote branch 'origin/2.1'

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

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;