From 88175b46824501ff6624a14260ee01c28b71c4e1 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sat, 31 Aug 2019 12:30:38 +0200 Subject: [PATCH 1/3] Call mothods necessary to init QtWebView on some platforms --- nymea-app/main.cpp | 2 ++ nymea-app/nymea-app.pro | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp index 6c356838..2f28fbae 100644 --- a/nymea-app/main.cpp +++ b/nymea-app/main.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #ifdef Q_OS_ANDROID #include @@ -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(); diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index 20817a78..29552de8 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -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 From d87ed69ab4f60aa5b23917ef6c9d8d7a7c08e91a Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sat, 31 Aug 2019 22:52:03 +0200 Subject: [PATCH 2/3] fix dpkg package deps --- packaging/ubuntu/debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/ubuntu/debian/control b/packaging/ubuntu/debian/control index 49c654a9..e6e7c139 100644 --- a/packaging/ubuntu/debian/control +++ b/packaging/ubuntu/debian/control @@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 9.0.0), qtconnectivity5-dev, qtdeclarative5-dev, qtquickcontrols2-5-dev, + libqt5webview5-dev, Package: nymea-app Architecture: any From 0361aa5f20dc61fb9be6e9c6e0eaa8b598c5f875 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 1 Sep 2019 01:51:05 +0200 Subject: [PATCH 3/3] fix snapcraft deps --- snapcraft.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index 141738c8..e9d56233 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -52,6 +52,7 @@ parts: - libqt5charts5-dev - libqt5svg5-dev - libqt5websockets5-dev + - libqt5webview5-dev - qtconnectivity5-dev - qtdeclarative5-dev - qtquickcontrols2-5-dev