diff options
author | Morten Johan Sørvig <morten.sorvig@digia.com> | 2013-09-02 09:30:26 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-02 13:07:35 +0200 |
commit | 8fc97fdfc76fc62e1faa23f8b768d1ec303329d4 (patch) | |
tree | 3991bf746691a6c33615718dd05f6e23b9795ec6 /src/plugins/platforms/cocoa/cocoa.pro | |
parent | 585758389c64e556ef4808308dee27e19241581e (diff) |
Revert Mac event loop changes.
"Make QGuiApplication::exec() run within NSApplicationMain()"
"Make Qt process native and timer events on Cocoa applications"
"Cocoa: Fix QFontDialog, QColorDialog auto-tests"
This reverts commits
1e14762b8d79118540bd09a84dd3e48f4f5e113e
e4b2a0b4bab2a17a65fedafe9bae50af1fe019f6
df7944e7d7dd8b2bbccbd639eff0ab09745d6cc3
Change-Id: I80b65b5ee0297b090f807bd420664233dfc44f7b
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/cocoa.pro')
-rw-r--r-- | src/plugins/platforms/cocoa/cocoa.pro | 110 |
1 files changed, 106 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index dd13882f8c..a2fd8c0613 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -1,7 +1,109 @@ -TEMPLATE = subdirs +TARGET = qcocoa -cocoamain.file = cocoamain.pro -cocoaplugin.file = cocoaplugin.pro +PLUGIN_TYPE = platforms +PLUGIN_CLASS_NAME = QCocoaIntegrationPlugin +load(qt_plugin) -SUBDIRS = cocoamain cocoaplugin +OBJECTIVE_SOURCES += main.mm \ + qcocoaintegration.mm \ + qcocoatheme.mm \ + qcocoabackingstore.mm \ + qcocoawindow.mm \ + qnsview.mm \ + qnsviewaccessibility.mm \ + qcocoaautoreleasepool.mm \ + qnswindowdelegate.mm \ + qcocoaglcontext.mm \ + qcocoanativeinterface.mm \ + qcocoaeventdispatcher.mm \ + qcocoaapplicationdelegate.mm \ + qcocoaapplication.mm \ + qcocoamenu.mm \ + qcocoamenuitem.mm \ + qcocoamenubar.mm \ + qcocoamenuloader.mm \ + qcocoahelpers.mm \ + qmultitouch_mac.mm \ + qcocoaaccessibilityelement.mm \ + qcocoaaccessibility.mm \ + qcocoacolordialoghelper.mm \ + qcocoafiledialoghelper.mm \ + qcocoafontdialoghelper.mm \ + qcocoacursor.mm \ + qcocoaclipboard.mm \ + qcocoadrag.mm \ + qmacclipboard.mm \ + qmacmime.mm \ + qcocoasystemsettings.mm \ + qcocoainputcontext.mm \ + qcocoaservices.mm \ + qcocoasystemtrayicon.mm \ + qcocoaintrospection.mm \ + qcocoakeymapper.mm \ +SOURCES += messages.cpp + +HEADERS += qcocoaintegration.h \ + qcocoatheme.h \ + qcocoabackingstore.h \ + qcocoawindow.h \ + qnsview.h \ + qcocoaautoreleasepool.h \ + qnswindowdelegate.h \ + qcocoaglcontext.h \ + qcocoanativeinterface.h \ + qcocoaeventdispatcher.h \ + qcocoaapplicationdelegate.h \ + qcocoaapplication.h \ + qcocoamenu.h \ + qcocoamenuitem.h \ + qcocoamenubar.h \ + qcocoamenuloader.h \ + qcocoahelpers.h \ + qmultitouch_mac_p.h \ + qcocoaaccessibilityelement.h \ + qcocoaaccessibility.h \ + qcocoacolordialoghelper.h \ + qcocoafiledialoghelper.h \ + qcocoafontdialoghelper.h \ + qcocoacursor.h \ + qcocoaclipboard.h \ + qcocoadrag.h \ + qmacclipboard.h \ + qmacmime.h \ + qcocoasystemsettings.h \ + qcocoainputcontext.h \ + qcocoaservices.h \ + qcocoasystemtrayicon.h \ + qcocoaintrospection.h \ + qcocoakeymapper.h \ + messages.h + +RESOURCES += qcocoaresources.qrc + +LIBS += -framework Cocoa -framework Carbon -framework IOKit + +QT += core-private gui-private platformsupport-private + +qtHaveModule(widgets) { + OBJECTIVE_SOURCES += \ + qpaintengine_mac.mm \ + qprintengine_mac.mm \ + qcocoaprintersupport.mm \ + + HEADERS += \ + qpaintengine_mac_p.h \ + qprintengine_mac_p.h \ + qcocoaprintersupport.h \ + + QT += widgets-private printsupport-private +} + +OTHER_FILES += cocoa.json + +# Acccessibility debug support +# DEFINES += QT_COCOA_ENABLE_ACCESSIBILITY_INSPECTOR +# include ($$PWD/../../../../util/accessibilityinspector/accessibilityinspector.pri) + +# Window debug support +#DEFINES += QT_COCOA_ENABLE_WINDOW_DEBUG |