From e00a961732ad028a1ead1eae1d8aecf1492d3008 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 30 Oct 2013 15:18:25 +0100
Subject: Clean up QPlatformPrinterSupport via post routine.

Change-Id: I5aff587f0186f15c9fa65d236e5ebe9a7901dd86
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/printsupport/kernel/qplatformprintplugin.cpp | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'src/printsupport/kernel/qplatformprintplugin.cpp')

diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp
index ce6d7a0f7e..e38b481a0e 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,14 @@ QPlatformPrinterSupportPlugin::~QPlatformPrinterSupportPlugin()
 {
 }
 
+static QPlatformPrinterSupport *printerSupport = 0;
+
+static void cleanupPrinterSupport()
+{
+    delete printerSupport;
+    printerSupport = 0;
+}
+
 /*!
     \internal
 
@@ -68,13 +79,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
-- 
cgit v1.2.3