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>
This commit is contained in:
Jake Petroules 2015-08-26 01:48:34 -07:00 committed by Mika Lindqvist
parent 76cf88157f
commit 353b160a4a
54 changed files with 63 additions and 61 deletions

View File

@ -31,7 +31,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include <QtWidgets> #include <QtWidgets>
#include <QMacCocoaViewContainer> #include <QMacCocoaViewContainer>

View File

@ -1,7 +1,7 @@
TEMPLATE = app TEMPLATE = app
OBJECTIVE_SOURCES += main.mm OBJECTIVE_SOURCES += main.mm
LIBS += -framework Cocoa LIBS += -framework AppKit
QT += widgets QT += widgets

View File

@ -31,7 +31,7 @@
** **
****************************************************************************/ ****************************************************************************/
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#include <QApplication> #include <QApplication>
#include <QDebug> #include <QDebug>

View File

@ -1,7 +1,7 @@
TEMPLATE = app TEMPLATE = app
OBJECTIVE_SOURCES += main.mm OBJECTIVE_SOURCES += main.mm
LIBS += -framework Cocoa LIBS += -framework AppKit
QT += widgets QT += widgets
#QT += widgets-private gui-private core-private #QT += widgets-private gui-private core-private

View File

@ -33,7 +33,7 @@ testcocoon {
load(testcocoon) load(testcocoon)
} }
mac:!ios: LIBS_PRIVATE += -framework Cocoa osx: LIBS_PRIVATE += -framework AppKit
CONFIG += simd optimize_full CONFIG += simd optimize_full

View File

@ -34,7 +34,7 @@
#include "cglconvenience_p.h" #include "cglconvenience_p.h"
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#include <QtCore/private/qcore_mac_p.h> #include <QtCore/private/qcore_mac_p.h>
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include <QVector> #include <QVector>
void (*qcgl_getProcAddress(const QByteArray &procName))() void (*qcgl_getProcAddress(const QByteArray &procName))()

View File

@ -1,4 +1,4 @@
mac:!ios { osx {
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
HEADERS += \ HEADERS += \
@ -7,5 +7,5 @@ mac:!ios {
OBJECTIVE_SOURCES += \ OBJECTIVE_SOURCES += \
$$PWD/cglconvenience.mm $$PWD/cglconvenience.mm
LIBS_PRIVATE += -framework Cocoa -framework OpenGL LIBS_PRIVATE += -framework AppKit -framework OpenGL
} }

View File

@ -32,10 +32,13 @@
****************************************************************************/ ****************************************************************************/
#include <QtCore/qsystemdetection.h> #include <QtCore/qsystemdetection.h>
#if defined(Q_OS_OSX)
#import <AppKit/AppKit.h>
#endif
#if defined(Q_OS_IOS) #if defined(Q_OS_IOS)
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#elif defined(Q_OS_OSX)
#import <Cocoa/Cocoa.h>
#endif #endif
#include "qmacmime_p.h" #include "qmacmime_p.h"

View File

@ -35,8 +35,8 @@
#include <sys/param.h> #include <sys/param.h>
#if defined(Q_OS_MACX) #if defined(Q_OS_OSX)
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#import <IOKit/graphics/IOGraphicsLib.h> #import <IOKit/graphics/IOGraphicsLib.h>
#elif defined(Q_OS_IOS) #elif defined(Q_OS_IOS)
#import <UIKit/UIFont.h> #import <UIKit/UIFont.h>

View File

@ -84,7 +84,7 @@ contains(QT_CONFIG, opengl.*) {
RESOURCES += qcocoaresources.qrc 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 QT += core-private gui-private platformsupport-private

View File

@ -31,7 +31,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include <qpa/qplatformintegrationplugin.h> #include <qpa/qplatformintegrationplugin.h>
#include <qpa/qplatformthemeplugin.h> #include <qpa/qplatformthemeplugin.h>

View File

@ -33,7 +33,7 @@
#ifndef QCOCOAACCESIBILITY_H #ifndef QCOCOAACCESIBILITY_H
#define QCOCOAACCESIBILITY_H #define QCOCOAACCESIBILITY_H
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include <QtGui> #include <QtGui>
#include <qpa/qplatformaccessibility.h> #include <qpa/qplatformaccessibility.h>

View File

@ -37,8 +37,7 @@
#include "qt_mac_p.h" #include "qt_mac_p.h"
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#import <AppKit/NSAccessibility.h>
#import <qaccessible.h> #import <qaccessible.h>

View File

@ -79,7 +79,7 @@
// //
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#include <qglobal.h> #include <qglobal.h>
#include <private/qcore_mac_p.h> #include <private/qcore_mac_p.h>

View File

@ -34,7 +34,7 @@
#ifndef QBACKINGSTORE_COCOA_H #ifndef QBACKINGSTORE_COCOA_H
#define QBACKINGSTORE_COCOA_H #define QBACKINGSTORE_COCOA_H
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include "qcocoawindow.h" #include "qcocoawindow.h"
#include "qnsview.h" #include "qnsview.h"

View File

@ -34,7 +34,7 @@
#ifndef QWINDOWSCURSOR_H #ifndef QWINDOWSCURSOR_H
#define QWINDOWSCURSOR_H #define QWINDOWSCURSOR_H
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include <QtCore> #include <QtCore>
#include <qpa/qplatformcursor.h> #include <qpa/qplatformcursor.h>

View File

@ -34,7 +34,7 @@
#ifndef QCOCOADRAG_H #ifndef QCOCOADRAG_H
#define QCOCOADRAG_H #define QCOCOADRAG_H
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include <QtGui> #include <QtGui>
#include <qpa/qplatformdrag.h> #include <qpa/qplatformdrag.h>
#include <private/qsimpledrag_p.h> #include <private/qsimpledrag_p.h>

View File

@ -80,7 +80,7 @@
#include <qdebug.h> #include <qdebug.h>
#undef slots #undef slots
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

View File

@ -40,7 +40,7 @@
#include <QtGui/QWindow> #include <QtGui/QWindow>
#undef slots #undef slots
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

View File

@ -39,7 +39,7 @@
#include <QtPlatformSupport/private/cglconvenience_p.h> #include <QtPlatformSupport/private/cglconvenience_p.h>
#include <QtPlatformHeaders/qcocoanativecontext.h> #include <QtPlatformHeaders/qcocoanativecontext.h>
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

View File

@ -34,7 +34,7 @@
#ifndef QPLATFORMINTEGRATION_COCOA_H #ifndef QPLATFORMINTEGRATION_COCOA_H
#define QPLATFORMINTEGRATION_COCOA_H #define QPLATFORMINTEGRATION_COCOA_H
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include "qcocoacursor.h" #include "qcocoacursor.h"
#include "qcocoawindow.h" #include "qcocoawindow.h"

View File

@ -36,7 +36,7 @@
#include <qcocoahelpers.h> #include <qcocoahelpers.h>
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#include <QtCore/QList> #include <QtCore/QList>

View File

@ -31,7 +31,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include "qcocoamenubar.h" #include "qcocoamenubar.h"
#include "qcocoawindow.h" #include "qcocoawindow.h"

View File

@ -45,7 +45,7 @@
// We mean it. // We mean it.
// //
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#include <QtCore/private/qcore_mac_p.h> #include <QtCore/private/qcore_mac_p.h>
@interface QT_MANGLE_NAMESPACE(QCocoaMenuLoader) : NSResponder @interface QT_MANGLE_NAMESPACE(QCocoaMenuLoader) : NSResponder

View File

@ -60,7 +60,7 @@
#include <QtPlatformHeaders/qcocoawindowfunctions.h> #include <QtPlatformHeaders/qcocoawindowfunctions.h>
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

View File

@ -31,7 +31,7 @@
** **
****************************************************************************/ ****************************************************************************/
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#include "qcocoatheme.h" #include "qcocoatheme.h"
#include "messages.h" #include "messages.h"

View File

@ -34,7 +34,7 @@
#ifndef QCOCOAWINDOW_H #ifndef QCOCOAWINDOW_H
#define QCOCOAWINDOW_H #define QCOCOAWINDOW_H
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include <qpa/qplatformwindow.h> #include <qpa/qplatformwindow.h>
#include <QRect> #include <QRect>

View File

@ -47,7 +47,7 @@
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <qpa/qplatformscreen.h> #include <qpa/qplatformscreen.h>
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include <Carbon/Carbon.h> #include <Carbon/Carbon.h>
#include <QDebug> #include <QDebug>

View File

@ -39,7 +39,7 @@
#undef slots #undef slots
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

View File

@ -92,7 +92,7 @@ typedef signed long OSStatus;
# define old_slots slots # define old_slots slots
# undef slots # undef slots
# endif # endif
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
# ifdef old_slots # ifdef old_slots
# undef slots # undef slots
# define slots # define slots

View File

@ -47,7 +47,7 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <qhash.h> #include <qhash.h>

View File

@ -34,7 +34,7 @@
#ifndef QNSVIEW_H #ifndef QNSVIEW_H
#define QNSVIEW_H #define QNSVIEW_H
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include <QtCore/QPointer> #include <QtCore/QPointer>
#include <QtGui/QImage> #include <QtGui/QImage>

View File

@ -34,7 +34,7 @@
#ifndef QNSWINDOWDELEGATE_H #ifndef QNSWINDOWDELEGATE_H
#define QNSWINDOWDELEGATE_H #define QNSWINDOWDELEGATE_H
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include "qcocoawindow.h" #include "qcocoawindow.h"

View File

@ -48,7 +48,7 @@
#include "qmacdefines_mac.h" #include "qmacdefines_mac.h"
#ifdef __OBJC__ #ifdef __OBJC__
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include <objc/runtime.h> #include <objc/runtime.h>
#endif #endif

View File

@ -5,7 +5,7 @@ PLUGIN_CLASS_NAME = QCocoaPrinterSupportPlugin
load(qt_plugin) load(qt_plugin)
QT += gui-private printsupport-private QT += gui-private printsupport-private
LIBS += -framework Cocoa LIBS += -framework AppKit
SOURCES += main.cpp SOURCES += main.cpp

View File

@ -8,10 +8,10 @@ HEADERS += \
dialogs/qprintdialog.h \ dialogs/qprintdialog.h \
dialogs/qprintpreviewdialog.h dialogs/qprintpreviewdialog.h
mac:!ios { osx {
OBJECTIVE_SOURCES += dialogs/qpagesetupdialog_mac.mm \ OBJECTIVE_SOURCES += dialogs/qpagesetupdialog_mac.mm \
dialogs/qprintdialog_mac.mm dialogs/qprintdialog_mac.mm
LIBS_PRIVATE += -framework Cocoa LIBS_PRIVATE += -framework AppKit
} }
win32 { win32 {

View File

@ -32,7 +32,7 @@
****************************************************************************/ ****************************************************************************/
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include "qpagesetupdialog.h" #include "qpagesetupdialog.h"

View File

@ -31,7 +31,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include "qprintdialog.h" #include "qprintdialog.h"
#include "qabstractprintdialog_p.h" #include "qabstractprintdialog_p.h"

View File

@ -31,7 +31,7 @@
** **
****************************************************************************/ ****************************************************************************/
#include "macmainwindow.h" #include "macmainwindow.h"
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#include <QtGui> #include <QtGui>

View File

@ -40,7 +40,7 @@
#include <QtGui/QtGui> #include <QtGui/QtGui>
#include <QtGui/qmacnativewidget_mac.h> #include <QtGui/qmacnativewidget_mac.h>
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
int main(int argc, char **argv) int main(int argc, char **argv)
{ {

View File

@ -1,4 +1,4 @@
!x11:mac:!ios { !x11:osx {
LIBS_PRIVATE += -framework Carbon -framework Cocoa -lz LIBS_PRIVATE += -framework Carbon -framework AppKit -lz
*-mwerks:INCLUDEPATH += compat *-mwerks:INCLUDEPATH += compat
} }

View File

@ -36,7 +36,7 @@
.../doc/src/qstyles.qdoc. .../doc/src/qstyles.qdoc.
*/ */
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
#include "qmacstyle_mac_p.h" #include "qmacstyle_mac_p.h"
#include "qmacstyle_mac_p_p.h" #include "qmacstyle_mac_p_p.h"

View File

@ -35,7 +35,7 @@
#ifdef Q_DEAD_CODE_FROM_QT4_MAC #ifdef Q_DEAD_CODE_FROM_QT4_MAC
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#include "qscroller_p.h" #include "qscroller_p.h"

View File

@ -31,7 +31,7 @@
** **
****************************************************************************/ ****************************************************************************/
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#include "qmaccocoaviewcontainer_mac.h" #include "qmaccocoaviewcontainer_mac.h"
#include <QtCore/QDebug> #include <QtCore/QDebug>

View File

@ -31,7 +31,7 @@
** **
****************************************************************************/ ****************************************************************************/
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#include "qmacnativewidget_mac.h" #include "qmacnativewidget_mac.h"
#include <QtCore/qdebug.h> #include <QtCore/qdebug.h>

View File

@ -32,7 +32,7 @@
****************************************************************************/ ****************************************************************************/
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#include "qmenu.h" #include "qmenu.h"
#include "qmenubar.h" #include "qmenubar.h"

View File

@ -42,7 +42,7 @@
#include <QtTest> #include <QtTest>
#include <unistd.h> #include <unistd.h>
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#import <ApplicationServices/ApplicationServices.h> #import <ApplicationServices/ApplicationServices.h>
QT_USE_NAMESPACE QT_USE_NAMESPACE

View File

@ -8,9 +8,9 @@ SOURCES += tst_qfontdialog.cpp
RESOURCES += testfonts.qrc RESOURCES += testfonts.qrc
mac { osx {
# ### fixme # ### fixme
# OBJECTIVE_SOURCES += tst_qfontdialog_mac_helpers.mm # OBJECTIVE_SOURCES += tst_qfontdialog_mac_helpers.mm
# LIBS += -framework Cocoa # LIBS += -framework AppKit
} }

View File

@ -39,7 +39,7 @@
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>
#include <private/qcore_mac_p.h> #include <private/qcore_mac_p.h>
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
QString nativeWindowTitle(QWidget *window, Qt::WindowState state) QString nativeWindowTitle(QWidget *window, Qt::WindowState state)
{ {

View File

@ -31,7 +31,7 @@
** **
****************************************************************************/ ****************************************************************************/
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
#include <QMenu> #include <QMenu>
#include <QTest> #include <QTest>

View File

@ -31,7 +31,7 @@
** **
****************************************************************************/ ****************************************************************************/
#import <Cocoa/Cocoa.h> #import <AppKit/AppKit.h>
@interface TestMouseMovedNSView : NSView { @interface TestMouseMovedNSView : NSView {
NSPoint mouseMovedPoint_; NSPoint mouseMovedPoint_;

View File

@ -2,7 +2,7 @@ TEMPLATE = app
TARGET = qmaccocoaviewcontainer TARGET = qmaccocoaviewcontainer
INCLUDEPATH += . INCLUDEPATH += .
QT += widgets QT += widgets
LIBS += -framework Cocoa LIBS += -framework AppKit
# Input # Input
OBJECTIVE_SOURCES += main.mm TestMouseMovedNSView.m OBJECTIVE_SOURCES += main.mm TestMouseMovedNSView.m
HEADERS += TestMouseMovedNSView.h HEADERS += TestMouseMovedNSView.h

View File

@ -36,7 +36,7 @@
#include <QtGui> #include <QtGui>
#include <QtWidgets/QtWidgets> #include <QtWidgets/QtWidgets>
#include <Cocoa/Cocoa.h> #include <AppKit/AppKit.h>
@interface AppDelegate : NSObject <NSApplicationDelegate> { @interface AppDelegate : NSObject <NSApplicationDelegate> {
QGuiApplication *m_app; QGuiApplication *m_app;

View File

@ -3,7 +3,7 @@ TEMPLATE = app
OBJECTIVE_SOURCES += main.mm OBJECTIVE_SOURCES += main.mm
HEADERS += rasterwindow.h HEADERS += rasterwindow.h
SOURCES += rasterwindow.cpp SOURCES += rasterwindow.cpp
LIBS += -framework Cocoa LIBS += -framework AppKit
QT += gui widgets quick QT += gui widgets quick