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>
---
 tests/manual/cocoa/qmaccocoaviewcontainer/TestMouseMovedNSView.h     | 2 +-
 tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro | 2 +-
 tests/manual/cocoa/qt_on_cocoa/main.mm                               | 2 +-
 tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro                       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tests/manual/cocoa')

diff --git a/tests/manual/cocoa/qmaccocoaviewcontainer/TestMouseMovedNSView.h b/tests/manual/cocoa/qmaccocoaviewcontainer/TestMouseMovedNSView.h
index 95601906e7..5aaffc7048 100644
--- a/tests/manual/cocoa/qmaccocoaviewcontainer/TestMouseMovedNSView.h
+++ b/tests/manual/cocoa/qmaccocoaviewcontainer/TestMouseMovedNSView.h
@@ -31,7 +31,7 @@
  **
  ****************************************************************************/
 
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 
 @interface TestMouseMovedNSView : NSView {
     NSPoint mouseMovedPoint_;
diff --git a/tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro b/tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro
index 9546adea1c..1d1eb08253 100644
--- a/tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro
+++ b/tests/manual/cocoa/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 TARGET = qmaccocoaviewcontainer
 INCLUDEPATH += .
 QT += widgets
-LIBS += -framework Cocoa
+LIBS += -framework AppKit
 # Input
 OBJECTIVE_SOURCES += main.mm TestMouseMovedNSView.m
 HEADERS += TestMouseMovedNSView.h
diff --git a/tests/manual/cocoa/qt_on_cocoa/main.mm b/tests/manual/cocoa/qt_on_cocoa/main.mm
index 23370b0305..219bb56416 100644
--- a/tests/manual/cocoa/qt_on_cocoa/main.mm
+++ b/tests/manual/cocoa/qt_on_cocoa/main.mm
@@ -36,7 +36,7 @@
 #include <QtGui>
 #include <QtWidgets/QtWidgets>
 
-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>
 
 @interface AppDelegate : NSObject <NSApplicationDelegate> {
     QGuiApplication *m_app;
diff --git a/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro b/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro
index 97e4473e15..91c4d2c875 100644
--- a/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro
+++ b/tests/manual/cocoa/qt_on_cocoa/qt_on_cocoa.pro
@@ -3,7 +3,7 @@ TEMPLATE = app
 OBJECTIVE_SOURCES += main.mm
 HEADERS += rasterwindow.h
 SOURCES += rasterwindow.cpp
-LIBS += -framework Cocoa
+LIBS += -framework AppKit
 
 QT += gui widgets quick
 
-- 
cgit v1.2.3