diff --git a/src/plugins/help/helpviewer.h b/src/plugins/help/helpviewer.h index 6085084f914..f64e214b644 100644 --- a/src/plugins/help/helpviewer.h +++ b/src/plugins/help/helpviewer.h @@ -44,6 +44,7 @@ #if defined(QT_NO_WEBKIT) #include #else +#include #include #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 diff --git a/src/plugins/help/helpviewer_qwv.cpp b/src/plugins/help/helpviewer_qwv.cpp index 76baa1ad496..3206c22b7ba 100644 --- a/src/plugins/help/helpviewer_qwv.cpp +++ b/src/plugins/help/helpviewer_qwv.cpp @@ -204,35 +204,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)