Merge branch 'feature/new-gui' of github.com:amnezia-vpn/amnezia-client into feature/new-gui

client/ui/controllers/settingsController.cpp

@@ -2,6 +2,10 @@
 
 #include <QStandardPaths>
 
+#ifdef Q_OS_IOS
+    #include <CoreFoundation/CoreFoundation.h>
+#endif
+
 #include "fileUtilites.h"
 #include "logger.h"
 #include "ui/qautostart.h"

client/ui/controllers/sitesController.cpp

@@ -3,6 +3,10 @@
 #include <QHostInfo>
 #include <QStandardPaths>
 
+#ifdef Q_OS_IOS
+    #include <CoreFoundation/CoreFoundation.h>
+#endif
+
 #include "fileUtilites.h"
 #include "utilities.h"
 

client/ui/qml/Pages2/PageSetupWizardConfigSource.qml

@@ -96,7 +96,9 @@ It's okay as long as it's from someone you trust.")
 
                 clickedFunction: function() {
                     ImportController.startDecodingQr()
-                    goToPage(PageEnum.PageSetupWizardQrReader)
+                    if (Qt.platform.os === "ios") {
+                        goToPage(PageEnum.PageSetupWizardQrReader)
+                    }
                 }
             }