Merge remote-tracking branch 'origin/4.0'

Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb

src/plugins/help/textbrowserhelpviewer.h

@@ -96,6 +96,8 @@ public:
     void scaleUp();
     void scaleDown();
 
+    void setSource(const QUrl &name);
+
 protected:
     void contextMenuEvent(QContextMenuEvent *event);
     bool eventFilter(QObject *obj, QEvent *event);