|
|
@ -25,6 +25,7 @@
|
|
|
|
#include <QWebView>
|
|
|
|
#include <QWebView>
|
|
|
|
#else
|
|
|
|
#else
|
|
|
|
#include <QWebEngineView>
|
|
|
|
#include <QWebEngineView>
|
|
|
|
|
|
|
|
#include <QtWebEngine>
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
CALAMARES_PLUGIN_FACTORY_DEFINITION( WebViewStepFactory, registerPlugin<WebViewStep>(); )
|
|
|
|
CALAMARES_PLUGIN_FACTORY_DEFINITION( WebViewStepFactory, registerPlugin<WebViewStep>(); )
|
|
|
@ -33,6 +34,9 @@ WebViewStep::WebViewStep( QObject* parent )
|
|
|
|
: Calamares::ViewStep( parent )
|
|
|
|
: Calamares::ViewStep( parent )
|
|
|
|
{
|
|
|
|
{
|
|
|
|
emit nextStatusChanged( true );
|
|
|
|
emit nextStatusChanged( true );
|
|
|
|
|
|
|
|
#ifdef WEBVIEW_WITH_WEBENGINE
|
|
|
|
|
|
|
|
QtWebEngine::initialize();
|
|
|
|
|
|
|
|
#endif
|
|
|
|
m_view = new C_QWEBVIEW();
|
|
|
|
m_view = new C_QWEBVIEW();
|
|
|
|
#ifdef WEBVIEW_WITH_WEBKIT
|
|
|
|
#ifdef WEBVIEW_WITH_WEBKIT
|
|
|
|
m_view->settings()->setFontFamily( QWebSettings::StandardFont,
|
|
|
|
m_view->settings()->setFontFamily( QWebSettings::StandardFont,
|
|
|
|