Fixes for MacOS build with Qt5

status-im · Feb 6, 2023 · 80bb1d2 · 80bb1d2
1 parent 641da36
commit 80bb1d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/examples/QZXingLive/application.cpp b/examples/QZXingLive/application.cpp
@@ -28,7 +28,7 @@ Application::Application()
     connect(this, &Application::onPermissionsDenied,
             this, &Application::initializeQML);
 
-#if QT_VERSION < 0x060000
+#if defined(Q_OS_ANDROID) && QT_VERSION < 0x060000
   NativeHelpers::registerApplicationInstance(this);
 #endif
 }

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -49,14 +49,10 @@ if(WIN32)
     if(MSVC)
         add_definitions(-D__STDC_LIMIT_MACROS)
     endif(MSVC)
-
+else()
     add_definitions(-DNO_ICONV)
 endif(WIN32)
 
-if(ANDROID)
-    add_definitions(-DNO_ICONV)
-endif()
-
 if(VS_WINRT_COMPONENT)
     add_definitions(-DNO_ICONV)
 endif(VS_WINRT_COMPONENT)