Merge remote branch 'origin/2.1'

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

src/plugins/help/filtersettingspage.cpp

@@ -247,6 +247,12 @@ void FilterSettingsPage::apply()
     }
 }
 
+void FilterSettingsPage::finish()
+{
+    disconnect(Core::HelpManager::instance(), SIGNAL(documentationChanged()),
+        this, SLOT(updateFilterPage()));
+}
+
 bool FilterSettingsPage::matches(const QString &s) const
 {
     return m_searchKeywords.contains(s, Qt::CaseInsensitive);

src/plugins/help/filtersettingspage.h

@@ -52,7 +52,7 @@ public:
 
     QWidget *createPage(QWidget *parent);
     void apply();
-    void finish() {}
+    void finish();
     virtual bool matches(const QString &s) const;
 
 signals: