From a64e53bb592911ed1aebfcea6c510deecf8c8ebc Mon Sep 17 00:00:00 2001
From: "pls.153" <pls.153@protonmail.com>
Date: Wed, 25 Dec 2024 18:33:25 +0100
Subject: [PATCH] revisions regarding iOS and latest Xcode

---
 examples/cl-repl/cpp/qt.cpp | 4 ++--
 examples/cl-repl/cpp/qt.h   | 2 --
 examples/meshtastic/app.pro | 5 +----
 src/cpp/main.h              | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/examples/cl-repl/cpp/qt.cpp b/examples/cl-repl/cpp/qt.cpp
index 824d694..f2492d1 100644
--- a/examples/cl-repl/cpp/qt.cpp
+++ b/examples/cl-repl/cpp/qt.cpp
@@ -94,16 +94,16 @@ QVariant QT::connectDocumentChanged(const QVariant& vDocument, const QVariant& v
   return false;
 }
 
-#ifdef Q_OS_IOS
 QVariant QT::connectKeyPressed() {
+#ifdef Q_OS_IOS
   GuiApplication* sender = static_cast<GuiApplication*>(qGuiApp);
   connect(sender, &GuiApplication::keyPressed,
           [](const QString& key, const QString& objectName) {
             ecl_fun("editor:key-pressed", key, objectName);
           });
+#endif
   return QVariant();
 }
-#endif
 
 
 // methods
diff --git a/examples/cl-repl/cpp/qt.h b/examples/cl-repl/cpp/qt.h
index 59b61fd..8d0f5bd 100644
--- a/examples/cl-repl/cpp/qt.h
+++ b/examples/cl-repl/cpp/qt.h
@@ -80,9 +80,7 @@ public:
 
   // connect
   Q_INVOKABLE QVariant connectDocumentChanged(const QVariant&, const QVariant&);
-#ifdef Q_OS_IOS
   Q_INVOKABLE QVariant connectKeyPressed();
-#endif
 
   // methods
   Q_INVOKABLE QVariant block2                (const QVariant&);
diff --git a/examples/meshtastic/app.pro b/examples/meshtastic/app.pro
index 4edcc75..ec73db7 100644
--- a/examples/meshtastic/app.pro
+++ b/examples/meshtastic/app.pro
@@ -132,10 +132,7 @@ ios {
   LIBS        += -lasdf -lecl-help -ldeflate -lecl-cdb -lecl-curl -lql-minitar -lsockets
   LIBS        += -L../../../platforms/ios/lib
 
-  # OpenSSL libs not included here, required for downloading map tiles
-  # either build them by yourself or find a trusted source for downloading,
-  # and put them here: '../../../platforms/ios/lib/'
-  LIBS        += -lcrypto -lssl
+  # note: SSL on Qt side works out of the box on iOS
 
   SOURCES += cpp/ios.mm
 
diff --git a/src/cpp/main.h b/src/cpp/main.h
index 5fe6746..4040624 100644
--- a/src/cpp/main.h
+++ b/src/cpp/main.h
@@ -118,9 +118,9 @@ public:
     }
     return QGuiApplication::eventFilter(object, event);
   }
+#endif
 
 Q_SIGNALS:
   void keyPressed(const QString&, const QString&);
-#endif
 };