ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #238: Call methods necessary to init QtWebView on some platforms

Browse Source
This commit is contained in:
Jenkins 2019-09-01 01:51:44 +02:00
commit f1745d6033
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nymea-app/main.cpp
View File

@ -26,6 +26,7 @@
#include <QSysInfo> #include <QSysInfo>
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QCommandLineOption> #include <QCommandLineOption>
#include <QtWebView>
#ifdef Q_OS_ANDROID #ifdef Q_OS_ANDROID
#include <QtAndroidExtras/QtAndroid> #include <QtAndroidExtras/QtAndroid>
@ -70,6 +71,7 @@ int main(int argc, char *argv[])
QApplication application(argc, argv); QApplication application(argc, argv);
application.setApplicationName("nymea-app"); application.setApplicationName("nymea-app");
application.setOrganizationName("nymea"); application.setOrganizationName("nymea");
QtWebView::initialize();
QCommandLineParser parser; QCommandLineParser parser;
parser.addHelpOption(); parser.addHelpOption();

2
nymea-app/nymea-app.pro
View File

@ -2,7 +2,7 @@ TEMPLATE=app
TARGET=nymea-app TARGET=nymea-app
include(../config.pri) 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 \ INCLUDEPATH += $$top_srcdir/libnymea-common \
$$top_srcdir/libnymea-app-core $$top_srcdir/libnymea-app-core

1
packaging/ubuntu/debian/control
View File

@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 9.0.0),
qtconnectivity5-dev, qtconnectivity5-dev,
qtdeclarative5-dev, qtdeclarative5-dev,
qtquickcontrols2-5-dev, qtquickcontrols2-5-dev,
libqt5webview5-dev,
Package: nymea-app Package: nymea-app
Architecture: any Architecture: any

1
snapcraft.yaml
View File

@ -52,6 +52,7 @@ parts:
- libqt5charts5-dev - libqt5charts5-dev
- libqt5svg5-dev - libqt5svg5-dev
- libqt5websockets5-dev - libqt5websockets5-dev
- libqt5webview5-dev
- qtconnectivity5-dev - qtconnectivity5-dev
- qtdeclarative5-dev - qtdeclarative5-dev
- qtquickcontrols2-5-dev - qtquickcontrols2-5-dev