1 files changed, 18 insertions, 4 deletions
diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp
index ce6d7a0f7e..f3e88e7cf7 100644
--- a/src/printsupport/kernel/qplatformprintplugin.cpp
+++ b/src/printsupport/kernel/qplatformprintplugin.cpp
@@ -40,7 +40,10 @@
 ****************************************************************************/
 
 #include "qplatformprintplugin.h"
+#include "qplatformprintersupport.h"
+#include "qprinterinfo.h"
 #include "private/qfactoryloader_p.h"
+#include <qcoreapplication.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -58,6 +61,16 @@ QPlatformPrinterSupportPlugin::~QPlatformPrinterSupportPlugin()
 {
 }
 
+static QPlatformPrinterSupport *printerSupport = 0;
+
+static void cleanupPrinterSupport()
+{
+#ifndef QT_NO_PRINTER
+    delete printerSupport;
+#endif
+    printerSupport = 0;
+}
+
 /*!
     \internal
 
@@ -68,13 +81,14 @@ QPlatformPrinterSupportPlugin::~QPlatformPrinterSupportPlugin()
 */
 QPlatformPrinterSupport *QPlatformPrinterSupportPlugin::get()
 {
-    static QPlatformPrinterSupport *singleton = 0;
-    if (!singleton) {
+    if (!printerSupport) {
         const QMultiMap<int, QString> keyMap = loader()->keyMap();
         if (!keyMap.isEmpty())
-            singleton = qLoadPlugin<QPlatformPrinterSupport, QPlatformPrinterSupportPlugin>(loader(), keyMap.constBegin().value());
+            printerSupport = qLoadPlugin<QPlatformPrinterSupport, QPlatformPrinterSupportPlugin>(loader(), keyMap.constBegin().value());
+        if (printerSupport)
+            qAddPostRoutine(cleanupPrinterSupport);
     }
-    return singleton;
+    return printerSupport;
 }
 
 QT_END_NAMESPACE