status-im/qzxing
2
0
Fork 0
mirror of https://github.com/status-im/qzxing.git synced 2025-01-13 04:24:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for MacOS build with Qt5

Browse Source
This commit is contained in:
Igor Sirotin 2023-02-06 18:02:08 +03:00
parent 641da3618b
commit 80bb1d2190
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/QZXingLive/application.cpp
View File

@ -28,7 +28,7 @@ Application::Application()
connect(this, &Application::onPermissionsDenied, connect(this, &Application::onPermissionsDenied,
this, &Application::initializeQML); this, &Application::initializeQML);
#if QT_VERSION < 0x060000 #if defined(Q_OS_ANDROID) && QT_VERSION < 0x060000
NativeHelpers::registerApplicationInstance(this); NativeHelpers::registerApplicationInstance(this);
#endif #endif
} }

6
src/CMakeLists.txt
View File

@ -49,14 +49,10 @@ if(WIN32)
if(MSVC) if(MSVC)
add_definitions(-D__STDC_LIMIT_MACROS) add_definitions(-D__STDC_LIMIT_MACROS)
endif(MSVC) endif(MSVC)
else()
add_definitions(-DNO_ICONV) add_definitions(-DNO_ICONV)
endif(WIN32) endif(WIN32)
if(ANDROID)
add_definitions(-DNO_ICONV)
endif()
if(VS_WINRT_COMPONENT) if(VS_WINRT_COMPONENT)
add_definitions(-DNO_ICONV) add_definitions(-DNO_ICONV)
endif(VS_WINRT_COMPONENT) endif(VS_WINRT_COMPONENT)