From 2cbd318f1da432024dc724a644da98da2b52692b Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Thu, 11 Jun 2015 17:39:15 +0200
Subject: Don't try to load plugins if QT_NO_LIBRARY is set.

Any plugin loading is impossible then and the code won't even compile.

Change-Id: I81e49ff87ae1a609521d526f5098a0d44cc28f7c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
---
 src/printsupport/kernel/qplatformprintplugin.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/printsupport')

diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp
index 091cc6f008..9adf39ffcd 100644
--- a/src/printsupport/kernel/qplatformprintplugin.cpp
+++ b/src/printsupport/kernel/qplatformprintplugin.cpp
@@ -55,6 +55,7 @@ QPlatformPrinterSupportPlugin::~QPlatformPrinterSupportPlugin()
 
 static QPlatformPrinterSupport *printerSupport = 0;
 
+#ifndef QT_NO_LIBRARY
 static void cleanupPrinterSupport()
 {
 #ifndef QT_NO_PRINTER
@@ -62,6 +63,7 @@ static void cleanupPrinterSupport()
 #endif
     printerSupport = 0;
 }
+#endif // !QT_NO_LIBRARY
 
 /*!
     \internal
@@ -73,6 +75,7 @@ static void cleanupPrinterSupport()
 */
 QPlatformPrinterSupport *QPlatformPrinterSupportPlugin::get()
 {
+#ifndef QT_NO_LIBRARY
     if (!printerSupport) {
         const QMultiMap<int, QString> keyMap = loader()->keyMap();
         if (!keyMap.isEmpty())
@@ -80,6 +83,7 @@ QPlatformPrinterSupport *QPlatformPrinterSupportPlugin::get()
         if (printerSupport)
             qAddPostRoutine(cleanupPrinterSupport);
     }
+#endif // !QT_NO_LIBRARY
     return printerSupport;
 }
 
-- 
cgit v1.2.3