Merge PR #238: Call methods necessary to init QtWebView on some platforms
This commit is contained in:
commit
f1745d6033
@ -26,6 +26,7 @@
|
||||
#include <QSysInfo>
|
||||
#include <QCommandLineParser>
|
||||
#include <QCommandLineOption>
|
||||
#include <QtWebView>
|
||||
|
||||
#ifdef Q_OS_ANDROID
|
||||
#include <QtAndroidExtras/QtAndroid>
|
||||
@ -70,6 +71,7 @@ int main(int argc, char *argv[])
|
||||
QApplication application(argc, argv);
|
||||
application.setApplicationName("nymea-app");
|
||||
application.setOrganizationName("nymea");
|
||||
QtWebView::initialize();
|
||||
|
||||
QCommandLineParser parser;
|
||||
parser.addHelpOption();
|
||||
|
||||
@ -2,7 +2,7 @@ TEMPLATE=app
|
||||
TARGET=nymea-app
|
||||
include(../config.pri)
|
||||
|
||||
QT += network qml quick quickcontrols2 svg websockets bluetooth charts gui-private
|
||||
QT += network qml quick quickcontrols2 svg websockets bluetooth charts gui-private webview
|
||||
|
||||
INCLUDEPATH += $$top_srcdir/libnymea-common \
|
||||
$$top_srcdir/libnymea-app-core
|
||||
|
||||
@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 9.0.0),
|
||||
qtconnectivity5-dev,
|
||||
qtdeclarative5-dev,
|
||||
qtquickcontrols2-5-dev,
|
||||
libqt5webview5-dev,
|
||||
|
||||
Package: nymea-app
|
||||
Architecture: any
|
||||
|
||||
@ -52,6 +52,7 @@ parts:
|
||||
- libqt5charts5-dev
|
||||
- libqt5svg5-dev
|
||||
- libqt5websockets5-dev
|
||||
- libqt5webview5-dev
|
||||
- qtconnectivity5-dev
|
||||
- qtdeclarative5-dev
|
||||
- qtquickcontrols2-5-dev
|
||||
|
||||
Reference in New Issue
Block a user