From 643f4a5726926b86693b442e318f40cf28fee04a Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 19 Mar 2019 12:40:33 -0700 Subject: Remove partial support for QWebEngine Printing never worked, none of this was ever included in test builds. Also, now that there are official releases of QtWebKit again, this just doesn't seem worth carrying along anymore. Signed-off-by: Dirk Hohndel --- desktop-widgets/usermanual.h | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'desktop-widgets/usermanual.h') diff --git a/desktop-widgets/usermanual.h b/desktop-widgets/usermanual.h index e005fb0fe..bb019f25b 100644 --- a/desktop-widgets/usermanual.h +++ b/desktop-widgets/usermanual.h @@ -2,12 +2,7 @@ #ifndef USERMANUAL_H #define USERMANUAL_H -#ifdef USE_WEBENGINE -#include -#include -#else #include -#endif #include #include "ui_searchbar.h" @@ -27,27 +22,6 @@ private: Ui::SearchBar ui; }; -#ifdef USE_WEBENGINE -class MyQWebEnginePage : public QWebEnginePage -{ - Q_OBJECT - -public: - MyQWebEnginePage(QObject* parent = 0); - bool acceptNavigationRequest(const QUrl & url, QWebEnginePage::NavigationType type, bool); -}; - -class MyQWebEngineView : public QWebEngineView -{ - Q_OBJECT - -public: - MyQWebEngineView(QWidget* parent = 0); - MyQWebEnginePage* page() const; -}; -#endif - - class UserManual : public QDialog { Q_OBJECT @@ -67,18 +41,11 @@ slots: void searchTextChanged(const QString& s); void searchNext(); void searchPrev(); -#ifndef USE_WEBENGINE void linkClickedSlot(const QUrl& url); -#endif private: SearchBar *searchBar; QString mLastText; -#ifdef USE_WEBENGINE - QWebEngineView *userManual; - void search(QString, QWebEnginePage::FindFlags); -#else QWebView *userManual; void search(QString, QWebPage::FindFlags); -#endif }; #endif // USERMANUAL_H -- cgit v1.2.3-70-g09d2