diff options
author | Tor Arne Vestbø <torarnv@gmail.com> | 2020-04-03 12:45:36 +0200 |
---|---|---|
committer | Tor Arne Vestbø <torarnv@gmail.com> | 2020-04-03 13:44:37 +0200 |
commit | ab4c22d47d196d5eb28fc16cd7262c77bcb6875f (patch) | |
tree | 29022a8bdd5849cd6d0e9755063c449110b8686d /src/platformsupport/fontdatabases/mac | |
parent | 7e7c6498841cb4e5a5b4454424a374b70bb111d9 (diff) |
macOS: Remove all use of deprecated Q_OS_OSX define
Change-Id: I49c285604694c93d37c9d1c7cd6d3b1509858319
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/platformsupport/fontdatabases/mac')
-rw-r--r-- | src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm | 2 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm index 894919a1c8..bf986aab77 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm @@ -41,7 +41,7 @@ #include <sys/param.h> -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) #import <AppKit/AppKit.h> #import <IOKit/graphics/IOGraphicsLib.h> #elif defined(QT_PLATFORM_UIKIT) diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h index 51d839688d..fe5be960b3 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h @@ -55,7 +55,7 @@ #include <private/qcore_mac_p.h> #include <QtCore/qloggingcategory.h> -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS #include <ApplicationServices/ApplicationServices.h> #else #include <CoreText/CoreText.h> |