From 7f179eff61826323afea474b8ecd1a04f0a41e32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Mon, 11 May 2020 17:57:24 +0200
Subject: Move macOS print support from platform plugin into QtPrintSupport
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-83256
Change-Id: I29044b6c3f952c259f501f94a175c8ef2cbaae55
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/plugins/printsupport/cocoa/main.cpp | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'src/plugins/printsupport/cocoa/main.cpp')

diff --git a/src/plugins/printsupport/cocoa/main.cpp b/src/plugins/printsupport/cocoa/main.cpp
index b6830c88d4..26ef5cca22 100644
--- a/src/plugins/printsupport/cocoa/main.cpp
+++ b/src/plugins/printsupport/cocoa/main.cpp
@@ -42,6 +42,8 @@
 #include <qpa/qplatformnativeinterface.h>
 #include <qpa/qplatformprintplugin.h>
 
+#include <QtPrintSupport/private/qcocoaprintersupport_p.h>
+
 QT_BEGIN_NAMESPACE
 
 class QCocoaPrinterSupportPlugin : public QPlatformPrinterSupportPlugin
@@ -57,18 +59,8 @@ QPlatformPrinterSupport *QCocoaPrinterSupportPlugin::create(const QString &key)
 {
     if (key.compare(key, QLatin1String("cocoaprintersupport"), Qt::CaseInsensitive) != 0)
         return 0;
-    QGuiApplication *app = qobject_cast<QGuiApplication *>(QCoreApplication::instance());
-    if (!app)
-        return 0;
-    QPlatformNativeInterface *platformNativeInterface = app->platformNativeInterface();
-    int at = platformNativeInterface->metaObject()->indexOfMethod("createPlatformPrinterSupport()");
-    if (at == -1)
-        return 0;
-    QMetaMethod createPlatformPrinterSupport = platformNativeInterface->metaObject()->method(at);
-    QPlatformPrinterSupport *platformPrinterSupport = 0;
-    if (!createPlatformPrinterSupport.invoke(platformNativeInterface, Q_RETURN_ARG(QPlatformPrinterSupport *, platformPrinterSupport)))
-        return 0;
-    return platformPrinterSupport;
+
+    return new QCocoaPrinterSupport();
 }
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3