mirror of
https://github.com/status-im/qzxing.git
synced 2025-01-12 20:14:28 +00:00
Fixes for MacOS build with Qt5
This commit is contained in:
parent
641da3618b
commit
80bb1d2190
@ -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
|
||||
}
|
||||
|
@ -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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user