From c7aa427451a1a8483b842cd692b4298d224fdb89 Mon Sep 17 00:00:00 2001 From: demmm Date: Wed, 23 Mar 2016 18:17:09 -0400 Subject: [PATCH] port the webview page away from QtWebkit it is no longer maintained upstream this change is tested with QtWebEngine 5.6.0, it builds and runs displays the webview page correctly, clicking next however does not refresh that new page completely --- src/modules/webview/CMakeLists.txt | 8 ++++---- src/modules/webview/WebViewStep.cpp | 4 ++-- src/modules/webview/WebViewStep.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/modules/webview/CMakeLists.txt b/src/modules/webview/CMakeLists.txt index eb5c81a68..a1aa659b4 100644 --- a/src/modules/webview/CMakeLists.txt +++ b/src/modules/webview/CMakeLists.txt @@ -1,7 +1,7 @@ -find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebKit WebKitWidgets ) +find_package( Qt5 ${QT_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets ) include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui - ${QT_QTWEBKIT_INCLUDE_DIR} ) + ${QT_QTWEBENGINE_INCLUDE_DIR} ) set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules ) @@ -14,7 +14,7 @@ calamares_add_plugin( webview WebViewStep.cpp LINK_LIBRARIES calamaresui - Qt5::WebKit - Qt5::WebKitWidgets + Qt5::WebEngine + Qt5::WebEngineWidgets SHARED_LIB ) diff --git a/src/modules/webview/WebViewStep.cpp b/src/modules/webview/WebViewStep.cpp index 7fa5b5989..e0726bfa0 100644 --- a/src/modules/webview/WebViewStep.cpp +++ b/src/modules/webview/WebViewStep.cpp @@ -19,7 +19,7 @@ #include "WebViewStep.h" #include -#include +#include CALAMARES_PLUGIN_FACTORY_DEFINITION( WebViewStepFactory, registerPlugin(); ) @@ -27,7 +27,7 @@ WebViewStep::WebViewStep( QObject* parent ) : Calamares::ViewStep( parent ) { emit nextStatusChanged( true ); - m_view = new QWebView; + m_view = new QWebEngineView; } diff --git a/src/modules/webview/WebViewStep.h b/src/modules/webview/WebViewStep.h index af95ea269..4b6f3011d 100644 --- a/src/modules/webview/WebViewStep.h +++ b/src/modules/webview/WebViewStep.h @@ -28,7 +28,7 @@ #include -class QWebView; +class QWebEngineView; class PLUGINDLLEXPORT WebViewStep : public Calamares::ViewStep { @@ -57,7 +57,7 @@ public: void setConfigurationMap( const QVariantMap& configurationMap ) override; private: - QWebView *m_view; + QWebEngineView *m_view; QString m_url; QString m_prettyName; };