napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[webview] fix crash on loading webview page with QtWebengine

Browse Source
This commit is contained in:
Philip 2016-12-23 09:50:44 +01:00
parent edade9423f
commit 47600ea6d1
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/webview/WebViewStep.cpp
View File

@ -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,