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>
2015-08-26 01:48:34 -07:00 · 2015-08-26 01:48:34 -07:00 · 353b160a4a
commit 353b160a4a
parent 76cf88157f
54 changed files with 63 additions and 61 deletions
--- a/examples/widgets/mac/qmaccocoaviewcontainer/main.mm
+++ b/examples/widgets/mac/qmaccocoaviewcontainer/main.mm
@ -31,7 +31,7 @@
 **
 ****************************************************************************/

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>
 #include <QtWidgets>
 #include <QMacCocoaViewContainer>

--- a/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro
+++ b/examples/widgets/mac/qmaccocoaviewcontainer/qmaccocoaviewcontainer.pro
@ -1,7 +1,7 @@
 TEMPLATE = app

 OBJECTIVE_SOURCES += main.mm
-LIBS += -framework Cocoa
+LIBS += -framework AppKit

 QT += widgets

--- a/examples/widgets/mac/qmacnativewidget/main.mm
+++ b/examples/widgets/mac/qmacnativewidget/main.mm
@ -31,7 +31,7 @@
 **
 ****************************************************************************/

-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>

 #include <QApplication>
 #include <QDebug>
--- a/examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro
+++ b/examples/widgets/mac/qmacnativewidget/qmacnativewidget.pro
@ -1,7 +1,7 @@
 TEMPLATE = app

 OBJECTIVE_SOURCES += main.mm
-LIBS += -framework Cocoa
+LIBS += -framework AppKit

 QT += widgets
 #QT += widgets-private gui-private core-private
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@ -33,7 +33,7 @@ testcocoon {
    load(testcocoon)
 }

-mac:!ios: LIBS_PRIVATE += -framework Cocoa
+osx: LIBS_PRIVATE += -framework AppKit

 CONFIG += simd optimize_full

--- 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))()
--- 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
 }
--- 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"
--- 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>
--- a/src/plugins/platforms/cocoa/cocoa.pro
+++ b/src/plugins/platforms/cocoa/cocoa.pro
@ -84,7 +84,7 @@ contains(QT_CONFIG, opengl.*) {

 RESOURCES += qcocoaresources.qrc

-LIBS += -framework Cocoa -framework Carbon -framework IOKit -lcups
+LIBS += -framework AppKit -framework Carbon -framework IOKit -lcups

 QT += core-private gui-private platformsupport-private

--- a/src/plugins/platforms/cocoa/main.mm
+++ b/src/plugins/platforms/cocoa/main.mm
@ -31,7 +31,7 @@
 **
 ****************************************************************************/

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 #include <qpa/qplatformintegrationplugin.h>
 #include <qpa/qplatformthemeplugin.h>
--- a/src/plugins/platforms/cocoa/qcocoaaccessibility.h
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.h
@ -33,7 +33,7 @@
 #ifndef QCOCOAACCESIBILITY_H
 #define QCOCOAACCESIBILITY_H

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 #include <QtGui>
 #include <qpa/qplatformaccessibility.h>
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
@ -37,8 +37,7 @@

 #include "qt_mac_p.h"

-#import <Cocoa/Cocoa.h>
-#import <AppKit/NSAccessibility.h>
+#import <AppKit/AppKit.h>

 #import <qaccessible.h>

--- a/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.h
+++ b/src/plugins/platforms/cocoa/qcocoaapplicationdelegate.h
@ -79,7 +79,7 @@
 //


-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>

 #include <qglobal.h>
 #include <private/qcore_mac_p.h>
--- a/src/plugins/platforms/cocoa/qcocoabackingstore.h
+++ b/src/plugins/platforms/cocoa/qcocoabackingstore.h
@ -34,7 +34,7 @@
 #ifndef QBACKINGSTORE_COCOA_H
 #define QBACKINGSTORE_COCOA_H

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 #include "qcocoawindow.h"
 #include "qnsview.h"
--- a/src/plugins/platforms/cocoa/qcocoacursor.h
+++ b/src/plugins/platforms/cocoa/qcocoacursor.h
@ -34,7 +34,7 @@
 #ifndef QWINDOWSCURSOR_H
 #define QWINDOWSCURSOR_H

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 #include <QtCore>
 #include <qpa/qplatformcursor.h>
--- a/src/plugins/platforms/cocoa/qcocoadrag.h
+++ b/src/plugins/platforms/cocoa/qcocoadrag.h
@ -34,7 +34,7 @@
 #ifndef QCOCOADRAG_H
 #define QCOCOADRAG_H

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>
 #include <QtGui>
 #include <qpa/qplatformdrag.h>
 #include <private/qsimpledrag_p.h>
--- a/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
+++ b/src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm
@ -80,7 +80,7 @@
 #include <qdebug.h>

 #undef slots
-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>
 #include <Carbon/Carbon.h>

 QT_BEGIN_NAMESPACE
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.h
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h
@ -40,7 +40,7 @@
 #include <QtGui/QWindow>

 #undef slots
-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 QT_BEGIN_NAMESPACE

--- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
@ -39,7 +39,7 @@
 #include <QtPlatformSupport/private/cglconvenience_p.h>
 #include <QtPlatformHeaders/qcocoanativecontext.h>

-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>

 QT_BEGIN_NAMESPACE

--- a/src/plugins/platforms/cocoa/qcocoaintegration.h
+++ b/src/plugins/platforms/cocoa/qcocoaintegration.h
@ -34,7 +34,7 @@
 #ifndef QPLATFORMINTEGRATION_COCOA_H
 #define QPLATFORMINTEGRATION_COCOA_H

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 #include "qcocoacursor.h"
 #include "qcocoawindow.h"
--- a/src/plugins/platforms/cocoa/qcocoakeymapper.h
+++ b/src/plugins/platforms/cocoa/qcocoakeymapper.h
@ -36,7 +36,7 @@

 #include <qcocoahelpers.h>

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>
 #include <Carbon/Carbon.h>

 #include <QtCore/QList>
--- a/src/plugins/platforms/cocoa/qcocoamenubar.mm
+++ b/src/plugins/platforms/cocoa/qcocoamenubar.mm
@ -31,7 +31,7 @@
 **
 ****************************************************************************/

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 #include "qcocoamenubar.h"
 #include "qcocoawindow.h"
--- a/src/plugins/platforms/cocoa/qcocoamenuloader.h
+++ b/src/plugins/platforms/cocoa/qcocoamenuloader.h
@ -45,7 +45,7 @@
 // We mean it.
 //

-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 #include <QtCore/private/qcore_mac_p.h>

@interface QT_MANGLE_NAMESPACE(QCocoaMenuLoader) : NSResponder
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
@ -60,7 +60,7 @@

 #include <QtPlatformHeaders/qcocoawindowfunctions.h>

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 QT_BEGIN_NAMESPACE

--- a/src/plugins/platforms/cocoa/qcocoatheme.mm
+++ b/src/plugins/platforms/cocoa/qcocoatheme.mm
@ -31,7 +31,7 @@
 **
 ****************************************************************************/

-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>

 #include "qcocoatheme.h"
 #include "messages.h"
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@ -34,7 +34,7 @@
 #ifndef QCOCOAWINDOW_H
 #define QCOCOAWINDOW_H

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 #include <qpa/qplatformwindow.h>
 #include <QRect>
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@ -47,7 +47,7 @@
 #include <qpa/qwindowsysteminterface.h>
 #include <qpa/qplatformscreen.h>

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>
 #include <Carbon/Carbon.h>

 #include <QDebug>
--- a/src/plugins/platforms/cocoa/qmacclipboard.h
+++ b/src/plugins/platforms/cocoa/qmacclipboard.h
@ -39,7 +39,7 @@

 #undef slots

-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>

 QT_BEGIN_NAMESPACE

--- a/src/plugins/platforms/cocoa/qmacdefines_mac.h
+++ b/src/plugins/platforms/cocoa/qmacdefines_mac.h
@ -92,7 +92,7 @@ typedef signed long OSStatus;
 #      define old_slots slots
 #      undef slots
 #    endif
-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>
 #    ifdef old_slots
 #      undef slots
 #      define slots
--- a/src/plugins/platforms/cocoa/qmultitouch_mac_p.h
+++ b/src/plugins/platforms/cocoa/qmultitouch_mac_p.h
@ -47,7 +47,7 @@

 #include <QtCore/qglobal.h>

-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>

 #include <qpa/qwindowsysteminterface.h>
 #include <qhash.h>
--- a/src/plugins/platforms/cocoa/qnsview.h
+++ b/src/plugins/platforms/cocoa/qnsview.h
@ -34,7 +34,7 @@
 #ifndef QNSVIEW_H
 #define QNSVIEW_H

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 #include <QtCore/QPointer>
 #include <QtGui/QImage>
--- a/src/plugins/platforms/cocoa/qnswindowdelegate.h
+++ b/src/plugins/platforms/cocoa/qnswindowdelegate.h
@ -34,7 +34,7 @@
 #ifndef QNSWINDOWDELEGATE_H
 #define QNSWINDOWDELEGATE_H

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 #include "qcocoawindow.h"

--- a/src/plugins/platforms/cocoa/qt_mac_p.h
+++ b/src/plugins/platforms/cocoa/qt_mac_p.h
@ -48,7 +48,7 @@
 #include "qmacdefines_mac.h"

 #ifdef __OBJC__
-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>
 #include <objc/runtime.h>
 #endif

--- a/src/plugins/printsupport/cocoa/cocoa.pro
+++ b/src/plugins/printsupport/cocoa/cocoa.pro
@ -5,7 +5,7 @@ PLUGIN_CLASS_NAME = QCocoaPrinterSupportPlugin
 load(qt_plugin)

 QT += gui-private printsupport-private
-LIBS += -framework Cocoa
+LIBS += -framework AppKit

 SOURCES += main.cpp

--- a/src/printsupport/dialogs/dialogs.pri
+++ b/src/printsupport/dialogs/dialogs.pri
@ -8,10 +8,10 @@ HEADERS += \
        dialogs/qprintdialog.h \
        dialogs/qprintpreviewdialog.h

-mac:!ios {
+osx {
    OBJECTIVE_SOURCES += dialogs/qpagesetupdialog_mac.mm \
                         dialogs/qprintdialog_mac.mm
-    LIBS_PRIVATE += -framework Cocoa
+    LIBS_PRIVATE += -framework AppKit
 }

 win32 {
--- a/src/printsupport/dialogs/qpagesetupdialog_mac.mm
+++ b/src/printsupport/dialogs/qpagesetupdialog_mac.mm
@ -32,7 +32,7 @@
 ****************************************************************************/


-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 #include "qpagesetupdialog.h"

--- a/src/printsupport/dialogs/qprintdialog_mac.mm
+++ b/src/printsupport/dialogs/qprintdialog_mac.mm
@ -31,7 +31,7 @@
 **
 ****************************************************************************/

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 #include "qprintdialog.h"
 #include "qabstractprintdialog_p.h"
--- a/src/widgets/doc/snippets/macmainwindow.mm
+++ b/src/widgets/doc/snippets/macmainwindow.mm
@ -31,7 +31,7 @@
 **
 ****************************************************************************/
 #include "macmainwindow.h"
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 #include <QtGui>


--- a/src/widgets/doc/snippets/qmacnativewidget/main.mm
+++ b/src/widgets/doc/snippets/qmacnativewidget/main.mm
@ -40,7 +40,7 @@

 #include <QtGui/QtGui>
 #include <QtGui/qmacnativewidget_mac.h>
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>

 int main(int argc, char **argv)
 {
--- a/src/widgets/kernel/mac.pri
+++ b/src/widgets/kernel/mac.pri
@ -1,4 +1,4 @@
-!x11:mac:!ios {
-   LIBS_PRIVATE += -framework Carbon -framework Cocoa -lz
+!x11:osx {
+   LIBS_PRIVATE += -framework Carbon -framework AppKit -lz
   *-mwerks:INCLUDEPATH += compat
 }
--- a/src/widgets/styles/qmacstyle_mac.mm
+++ b/src/widgets/styles/qmacstyle_mac.mm
@ -36,7 +36,7 @@
  .../doc/src/qstyles.qdoc.
 */

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 #include "qmacstyle_mac_p.h"
 #include "qmacstyle_mac_p_p.h"
--- a/src/widgets/util/qscroller_mac.mm
+++ b/src/widgets/util/qscroller_mac.mm
@ -35,7 +35,7 @@

 #ifdef Q_DEAD_CODE_FROM_QT4_MAC

-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>

 #include "qscroller_p.h"

--- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
+++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm
@ -31,7 +31,7 @@
 **
 ****************************************************************************/

-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 #include "qmaccocoaviewcontainer_mac.h"

 #include <QtCore/QDebug>
--- a/src/widgets/widgets/qmacnativewidget_mac.mm
+++ b/src/widgets/widgets/qmacnativewidget_mac.mm
@ -31,7 +31,7 @@
 **
 ****************************************************************************/

-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 #include "qmacnativewidget_mac.h"

 #include <QtCore/qdebug.h>
--- a/src/widgets/widgets/qmenu_mac.mm
+++ b/src/widgets/widgets/qmenu_mac.mm
@ -32,7 +32,7 @@
 ****************************************************************************/

 #import <Foundation/Foundation.h>
-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>

 #include "qmenu.h"
 #include "qmenubar.h"
--- a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm
+++ b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm
@ -42,7 +42,7 @@
 #include <QtTest>
 #include <unistd.h>

-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>
 #import <ApplicationServices/ApplicationServices.h>

 QT_USE_NAMESPACE
--- a/tests/auto/widgets/dialogs/qfontdialog/qfontdialog.pro
+++ b/tests/auto/widgets/dialogs/qfontdialog/qfontdialog.pro
@ -8,9 +8,9 @@ SOURCES  += tst_qfontdialog.cpp

 RESOURCES += testfonts.qrc

-mac {
+osx {
 #    ### fixme
 #    OBJECTIVE_SOURCES += tst_qfontdialog_mac_helpers.mm
-#    LIBS += -framework Cocoa
+#    LIBS += -framework AppKit
 }

--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget_mac_helpers.mm
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget_mac_helpers.mm
@ -39,7 +39,7 @@
 #include <qpa/qplatformnativeinterface.h>
 #include <private/qcore_mac_p.h>

-#include <Cocoa/Cocoa.h>
+#include <AppKit/AppKit.h>

 QString nativeWindowTitle(QWidget *window, Qt::WindowState state)
 {
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu_mac.mm
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu_mac.mm
@ -31,7 +31,7 @@
 **
 ****************************************************************************/

-#import <Cocoa/Cocoa.h>
+#import <AppKit/AppKit.h>

 #include <QMenu>
 #include <QTest>
--- 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_;
--- 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
--- 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;
--- 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