Merge branch 'dev' into secure-config

client/main.cpp

@@ -37,7 +37,7 @@
 
 #include "QZXing.h"
 
-#include "platforms/ios/QRCodeReader.h"
+#include "platforms/ios/QRCodeReaderBase.h"
 
 #include "debug.h"
 #include "defines.h"
@@ -57,6 +57,10 @@
 #include "native.h"
 #endif
 
+#if defined(Q_OS_IOS)
+#include "QtAppDelegate-C-Interface.h"
+#endif
+
 static void loadTranslator()
 {
     QTranslator* translator = new QTranslator;
@@ -88,7 +92,6 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 #endif
 
-
 #ifdef Q_OS_WIN
     AllowSetForegroundWindow(0);
 #endif
@@ -97,6 +100,10 @@ int main(int argc, char *argv[])
     NativeHelpers::registerApplicationInstance(&app);
 #endif
 
+#if defined(Q_OS_IOS)
+    QtAppDelegateInitialize();
+#endif
+
     loadTranslator();
 
     QFontDatabase::addApplicationFont(":/fonts/Lato-Black.ttf");
@@ -220,6 +227,10 @@ int main(int argc, char *argv[])
     engine->rootContext()->setContextProperty("VpnLogic", uiLogic->vpnLogic());
     engine->rootContext()->setContextProperty("WizardLogic", uiLogic->wizardLogic());
 
+#if defined(Q_OS_IOS)
+    setStartPageLogic(uiLogic->startPageLogic());
+#endif
+
     engine->load(url);
 
     QObject::connect(&app, &QCoreApplication::aboutToQuit, uiLogic, [&engine, uiLogic](){