From 4fb7eb0da74798205f5cac693c921065492fa33e Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 6 Jan 2016 12:18:40 +0100 Subject: Drop most "#ifndef QT_NO_LIBRARY" As we can load plugins without QLibrary now, we don't have to #ifdef out the code that does so anymore. Change-Id: I1dc20216830a882dbd5a1b431183407e6b19c837 Reviewed-by: Friedemann Kleint Reviewed-by: Thiago Macieira --- src/printsupport/kernel/qplatformprintplugin.cpp | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/printsupport') diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp index dc059f6612..b50f43056b 100644 --- a/src/printsupport/kernel/qplatformprintplugin.cpp +++ b/src/printsupport/kernel/qplatformprintplugin.cpp @@ -45,10 +45,8 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QPlatformPrinterSupportFactoryInterface_iid, QLatin1String("/printsupport"), Qt::CaseInsensitive)) -#endif QPlatformPrinterSupportPlugin::QPlatformPrinterSupportPlugin(QObject *parent) : QObject(parent) @@ -61,15 +59,11 @@ QPlatformPrinterSupportPlugin::~QPlatformPrinterSupportPlugin() static QPlatformPrinterSupport *printerSupport = 0; -#ifndef QT_NO_LIBRARY static void cleanupPrinterSupport() { -#ifndef QT_NO_PRINTER delete printerSupport; -#endif printerSupport = 0; } -#endif // !QT_NO_LIBRARY /*! \internal @@ -81,7 +75,6 @@ static void cleanupPrinterSupport() */ QPlatformPrinterSupport *QPlatformPrinterSupportPlugin::get() { -#ifndef QT_NO_LIBRARY if (!printerSupport) { const QMultiMap keyMap = loader()->keyMap(); if (!keyMap.isEmpty()) @@ -89,7 +82,6 @@ QPlatformPrinterSupport *QPlatformPrinterSupportPlugin::get() if (printerSupport) qAddPostRoutine(cleanupPrinterSupport); } -#endif // !QT_NO_LIBRARY return printerSupport; } -- cgit v1.2.3