From 130ef17041d569662f1614c4876ab4e1141a5d8d Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 25 Nov 2019 23:37:51 +0100
Subject: [PATCH] don't bundle QtWebkiteCore, not allowed in app store

---
 nymea-app.pro      | 10 +++++-----
 nymea-app/main.cpp |  4 ++++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/nymea-app.pro b/nymea-app.pro
index c9a3631c..93543c3b 100644
--- a/nymea-app.pro
+++ b/nymea-app.pro
@@ -57,18 +57,18 @@ QMAKE_EXTRA_TARGETS += wininstaller
 # Install XCode and Qt clang64, add qmake directory to PATH
 # run "make osxbundle"
 osxbundle.depends = nymea-app
-osxbundle.commands += cd nymea-app && rm -f nymea-app.dmg nymea-app_writable.dmg nymea-app-osx-bundle*.dmg || true &&
+osxbundle.commands += cd nymea-app && rm -f ../*.dmg ../*pkg *.dmg || true &&
 osxbundle.commands += hdiutil eject /Volumes/nymea-app || true &&
-osxbundle.commands += macdeployqt nymea-app.app -qmldir=$$top_srcdir/nymea-app/ui -dmg &&
+osxbundle.commands += macdeployqt nymea-app.app -appstore-compliant -qmldir=$$top_srcdir/nymea-app/ui -dmg &&
 osxbundle.commands += hdiutil convert nymea-app.dmg -format UDRW -o nymea-app_writable.dmg &&
 osxbundle.commands += hdiutil attach -readwrite -noverify nymea-app_writable.dmg && sleep 2 &&
 osxbundle.commands += mv /Volumes/nymea-app/nymea-app.app /Volumes/nymea-app/nymea\:app.app &&
 osxbundle.commands += tar -xpf $$top_srcdir/packaging/osx/template.tar -C /Volumes/nymea-app/ &&
 osxbundle.commands += hdiutil eject /Volumes/nymea-app &&
 osxbundle.commands += hdiutil convert nymea-app_writable.dmg -format UDRO -o ../nymea-app-osx-bundle-$${APP_VERSION}.dmg &&
-osxbundle.commands += codesign -s "-" -f -i "io.nymea.nymeaApp.mac.QtWebEngineProcess" nymea-app.app/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app &&
-osxbundle.commands += productbuild --component nymea-app.app /Applications ../nymea-app-$${APP_VERSION}.pkg &&
-osxbundle.commands += rm nymea-app.dmg nymea-app_writable.dmg
+osxbundle.commands += rm nymea-app.dmg nymea-app_writable.dmg &&
+osxbundle.comments += rm -r nymea-app.app/Contents/Frameworks/QtWebEngineCore.framework &&
+osxbundle.commands += productbuild --component nymea-app.app /Applications ../nymea-app-$${APP_VERSION}.pkg
 QMAKE_EXTRA_TARGETS += osxbundle
 
 # Generic linux desktop
diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp
index 7c394a40..f096dd03 100644
--- a/nymea-app/main.cpp
+++ b/nymea-app/main.cpp
@@ -60,6 +60,10 @@ QObject *platformHelperProvider(QQmlEngine *engine, QJSEngine *scriptEngine)
 int main(int argc, char *argv[])
 {
 
+#ifdef Q_OS_OSX
+    qputenv("QT_WEBVIEW_PLUGIN", "native");
+#endif
+
     QLoggingCategory::setFilterRules("RemoteProxyClientJsonRpcTraffic.debug=false\n"
                                      "RemoteProxyClientJsonRpc.debug=false\n"
                                      "RemoteProxyClientWebSocket.debug=false\n"