diff options
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/common/macx.conf | 2 | ||||
-rw-r--r-- | mkspecs/common/uikit.conf | 2 | ||||
-rw-r--r-- | mkspecs/features/qt_common.prf | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf index 0f983f059a..6a1b076d7d 100644 --- a/mkspecs/common/macx.conf +++ b/mkspecs/common/macx.conf @@ -22,6 +22,4 @@ device.deployment_identifier = $${device.sdk} QMAKE_LIBS_VULKAN = -DEFINES += GL_SILENCE_DEPRECATION - include(mac.conf) diff --git a/mkspecs/common/uikit.conf b/mkspecs/common/uikit.conf index 424381e285..0388b8e616 100644 --- a/mkspecs/common/uikit.conf +++ b/mkspecs/common/uikit.conf @@ -7,6 +7,4 @@ CONFIG += bitcode reduce_exports shallow_bundle no_qt_rpath INCLUDEPATH += $$PWD/uikit -DEFINES += GLES_SILENCE_DEPRECATION - include(mac.conf) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index 8df94aa4ee..421adcdaa0 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -62,6 +62,13 @@ contains(TEMPLATE, .*lib)|darwin { if(!host_build|!cross_compile):qtConfig(reduce_exports): CONFIG += hide_symbols } +# Apple deprecated the entire OpenGL API in favor of Metal, which +# we are aware of, so silence the deprecation warnings in code. +# This does not apply to user-code, which will need to silence +# their own warnings if they use the deprecated APIs explicitly. +macos: DEFINES += GL_SILENCE_DEPRECATION +uikit: DEFINES += GLES_SILENCE_DEPRECATION + # The remainder of this file must not apply to host tools/libraries, # as the host compiler's version and capabilities are not checked. host_build:cross_compile: return() |