diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2015-08-26 01:48:34 -0700 |
---|---|---|
committer | Mika Lindqvist <postmaster@raasu.org> | 2015-09-05 11:49:17 +0000 |
commit | 353b160a4af276eb554679756f23436face00927 (patch) | |
tree | 4cca789ae7c8e4d02e4f9d66dc171ac692831d15 /src/platformsupport | |
parent | 76cf88157fc7d3a76e7f56aeb3fefff190ae946d (diff) |
Link to AppKit instead of Cocoa.
Cocoa is basically just AppKit + CoreData. Since we do not use CoreData
in Qt, there is no reason to link to it or (transitively) import its
headers.
This is just a mechanical replacement of -framework Cocoa with
-framework AppKit and <Cocoa/Cocoa.h> with <AppKit/AppKit.h>
Change-Id: Ibcfc8a03c0ddff27a67fbc87dd7bd58a4b648956
Reviewed-by: Mika Lindqvist <postmaster@raasu.org>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Diffstat (limited to 'src/platformsupport')
4 files changed, 10 insertions, 7 deletions
diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platformsupport/cglconvenience/cglconvenience.mm index 6b0a91e13f..b20f324442 100644 --- a/src/platformsupport/cglconvenience/cglconvenience.mm +++ b/src/platformsupport/cglconvenience/cglconvenience.mm @@ -34,7 +34,7 @@ #include "cglconvenience_p.h" #include <QtCore/qglobal.h> #include <QtCore/private/qcore_mac_p.h> -#include <Cocoa/Cocoa.h> +#include <AppKit/AppKit.h> #include <QVector> void (*qcgl_getProcAddress(const QByteArray &procName))() diff --git a/src/platformsupport/cglconvenience/cglconvenience.pri b/src/platformsupport/cglconvenience/cglconvenience.pri index 0e86ddb208..1de38bbd08 100644 --- a/src/platformsupport/cglconvenience/cglconvenience.pri +++ b/src/platformsupport/cglconvenience/cglconvenience.pri @@ -1,4 +1,4 @@ -mac:!ios { +osx { INCLUDEPATH += $$PWD HEADERS += \ @@ -7,5 +7,5 @@ mac:!ios { OBJECTIVE_SOURCES += \ $$PWD/cglconvenience.mm - LIBS_PRIVATE += -framework Cocoa -framework OpenGL + LIBS_PRIVATE += -framework AppKit -framework OpenGL } diff --git a/src/platformsupport/clipboard/qmacmime.mm b/src/platformsupport/clipboard/qmacmime.mm index ffa548bf83..5fec32c650 100644 --- a/src/platformsupport/clipboard/qmacmime.mm +++ b/src/platformsupport/clipboard/qmacmime.mm @@ -32,10 +32,13 @@ ****************************************************************************/ #include <QtCore/qsystemdetection.h> + +#if defined(Q_OS_OSX) +#import <AppKit/AppKit.h> +#endif + #if defined(Q_OS_IOS) #import <UIKit/UIKit.h> -#elif defined(Q_OS_OSX) -#import <Cocoa/Cocoa.h> #endif #include "qmacmime_p.h" diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm index 1f000421cc..222161734d 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm @@ -35,8 +35,8 @@ #include <sys/param.h> -#if defined(Q_OS_MACX) -#import <Cocoa/Cocoa.h> +#if defined(Q_OS_OSX) +#import <AppKit/AppKit.h> #import <IOKit/graphics/IOGraphicsLib.h> #elif defined(Q_OS_IOS) #import <UIKit/UIFont.h> |