Merge remote-tracking branch 'origin/2.6'

Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5

src/plugins/help/helpviewer.h

@@ -44,6 +44,7 @@
 #if defined(QT_NO_WEBKIT)
 #include <QTextBrowser>
 #else
+#include <QWebPage>
 #include <QWebView>
 #endif
 
@@ -140,6 +141,33 @@ private:
     HelpViewerPrivate *d;
 };
 
+#ifndef QT_NO_WEBKIT
+class HelpPage : public QWebPage
+{
+    Q_OBJECT
+public:
+    HelpPage(QObject *parent);
+
+protected:
+    virtual QWebPage *createWindow(QWebPage::WebWindowType);
+    virtual void triggerAction(WebAction action, bool checked = false);
+
+    virtual bool acceptNavigationRequest(QWebFrame *frame,
+        const QNetworkRequest &request, NavigationType type);
+
+private slots:
+    void onHandleUnsupportedContent(QNetworkReply *reply);
+
+private:
+    QUrl m_loadingUrl;
+    bool closeNewTabIfNeeded;
+
+    friend class Help::Internal::HelpViewer;
+    Qt::MouseButtons m_pressedButtons;
+    Qt::KeyboardModifiers m_keyboardModifiers;
+};
+#endif // QT_NO_WEBKIT
+
 }   // namespace Internal
 }   // namespace Help
 

src/plugins/help/helpviewer_qwv.cpp

@@ -208,35 +208,6 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation op,
         ? QLatin1String("application/octet-stream") : mimeType);
 }
 
-// -- HelpPage
-
-class HelpPage : public QWebPage
-{
-    Q_OBJECT
-public:
-    HelpPage(QObject *parent);
-
-protected:
-    virtual QWebPage *createWindow(QWebPage::WebWindowType);
-    virtual void triggerAction(WebAction action, bool checked = false);
-
-    virtual bool acceptNavigationRequest(QWebFrame *frame,
-        const QNetworkRequest &request, NavigationType type);
-
-private slots:
-    void onHandleUnsupportedContent(QNetworkReply *reply);
-
-private:
-    QUrl m_loadingUrl;
-    bool closeNewTabIfNeeded;
-
-    friend class Help::Internal::HelpViewer;
-    Qt::MouseButtons m_pressedButtons;
-    Qt::KeyboardModifiers m_keyboardModifiers;
-};
-#include "helpviewer_qwv.moc"
-
-
 // - HelpPage
 
 HelpPage::HelpPage(QObject *parent)