From 353b160a4af276eb554679756f23436face00927 Mon Sep 17 00:00:00 2001
From: Jake Petroules <jake.petroules@petroules.com>
Date: Wed, 26 Aug 2015 01:48:34 -0700
Subject: Link to AppKit instead of Cocoa.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/platformsupport/cglconvenience/cglconvenience.mm  | 2 +-
 src/platformsupport/cglconvenience/cglconvenience.pri | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/platformsupport/cglconvenience')

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
 }
-- 
cgit v1.2.3