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
This commit is contained in:
parent
e131882dda
commit
c7aa427451
@ -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
|
include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui
|
||||||
${QT_QTWEBKIT_INCLUDE_DIR} )
|
${QT_QTWEBENGINE_INCLUDE_DIR} )
|
||||||
|
|
||||||
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
|
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules )
|
${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules )
|
||||||
@ -14,7 +14,7 @@ calamares_add_plugin( webview
|
|||||||
WebViewStep.cpp
|
WebViewStep.cpp
|
||||||
LINK_LIBRARIES
|
LINK_LIBRARIES
|
||||||
calamaresui
|
calamaresui
|
||||||
Qt5::WebKit
|
Qt5::WebEngine
|
||||||
Qt5::WebKitWidgets
|
Qt5::WebEngineWidgets
|
||||||
SHARED_LIB
|
SHARED_LIB
|
||||||
)
|
)
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
#include "WebViewStep.h"
|
#include "WebViewStep.h"
|
||||||
|
|
||||||
#include <QVariant>
|
#include <QVariant>
|
||||||
#include <QWebView>
|
#include <QWebEngineView>
|
||||||
|
|
||||||
CALAMARES_PLUGIN_FACTORY_DEFINITION( WebViewStepFactory, registerPlugin<WebViewStep>(); )
|
CALAMARES_PLUGIN_FACTORY_DEFINITION( WebViewStepFactory, registerPlugin<WebViewStep>(); )
|
||||||
|
|
||||||
@ -27,7 +27,7 @@ WebViewStep::WebViewStep( QObject* parent )
|
|||||||
: Calamares::ViewStep( parent )
|
: Calamares::ViewStep( parent )
|
||||||
{
|
{
|
||||||
emit nextStatusChanged( true );
|
emit nextStatusChanged( true );
|
||||||
m_view = new QWebView;
|
m_view = new QWebEngineView;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
|
|
||||||
#include <QVariantMap>
|
#include <QVariantMap>
|
||||||
|
|
||||||
class QWebView;
|
class QWebEngineView;
|
||||||
|
|
||||||
class PLUGINDLLEXPORT WebViewStep : public Calamares::ViewStep
|
class PLUGINDLLEXPORT WebViewStep : public Calamares::ViewStep
|
||||||
{
|
{
|
||||||
@ -57,7 +57,7 @@ public:
|
|||||||
void setConfigurationMap( const QVariantMap& configurationMap ) override;
|
void setConfigurationMap( const QVariantMap& configurationMap ) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QWebView *m_view;
|
QWebEngineView *m_view;
|
||||||
QString m_url;
|
QString m_url;
|
||||||
QString m_prettyName;
|
QString m_prettyName;
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user