diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-11 17:57:24 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-06-04 01:46:27 +0200 |
commit | 7f179eff61826323afea474b8ecd1a04f0a41e32 (patch) | |
tree | a0b32c05171d45b5957f09034e3b6220894e1f8b /src/plugins/platforms/cocoa/qcocoanativeinterface.mm | |
parent | 6a3c6f939f29c83d53d2da0c3f53b814bdd02358 (diff) |
Move macOS print support from platform plugin into QtPrintSupport
Task-number: QTBUG-83256
Change-Id: I29044b6c3f952c259f501f94a175c8ef2cbaae55
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoanativeinterface.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm index 8e336d9ee7..fbc2e8f13e 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm @@ -59,12 +59,6 @@ #include <QtGui/qguiapplication.h> #include <qdebug.h> -#if !defined(QT_NO_WIDGETS) && defined(QT_PRINTSUPPORT_LIB) -#include "qcocoaprintersupport.h" -#include "qprintengine_mac_p.h" -#include <qpa/qplatformprintersupport.h> -#endif - #include <QtGui/private/qcoregraphics_p.h> #include <QtPlatformHeaders/qcocoawindowfunctions.h> @@ -147,30 +141,6 @@ QPlatformNativeInterface::NativeResourceForIntegrationFunction QCocoaNativeInter return nullptr; } -QPlatformPrinterSupport *QCocoaNativeInterface::createPlatformPrinterSupport() -{ -#if !defined(QT_NO_WIDGETS) && !defined(QT_NO_PRINTER) && defined(QT_PRINTSUPPORT_LIB) - return new QCocoaPrinterSupport(); -#else - qFatal("Printing is not supported when Qt is configured with -no-widgets or -no-feature-printer"); - return nullptr; -#endif -} - -void *QCocoaNativeInterface::NSPrintInfoForPrintEngine(QPrintEngine *printEngine) -{ -#if !defined(QT_NO_WIDGETS) && !defined(QT_NO_PRINTER) && defined(QT_PRINTSUPPORT_LIB) - QMacPrintEnginePrivate *macPrintEnginePriv = static_cast<QMacPrintEngine *>(printEngine)->d_func(); - if (macPrintEnginePriv->state == QPrinter::Idle && !macPrintEnginePriv->isPrintSessionInitialized()) - macPrintEnginePriv->initialize(); - return macPrintEnginePriv->printInfo; -#else - Q_UNUSED(printEngine); - qFatal("Printing is not supported when Qt is configured with -no-widgets or -no-feature-printer"); - return nullptr; -#endif -} - QPixmap QCocoaNativeInterface::defaultBackgroundPixmapForQWizard() { // Note: starting with macOS 10.14, the KeyboardSetupAssistant app bundle no |