From 4e4403d69c60ea6429b3ad5e7898a84b1dc92be5 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 8 May 2012 13:14:09 +0200
Subject: No longer use deprecated methods for plugin loading.

Change-Id: I19c66b1c41ea4dd236726c86d7d071b210ec9244
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
---
 src/printsupport/kernel/qplatformprintplugin.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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

diff --git a/src/printsupport/kernel/qplatformprintplugin.cpp b/src/printsupport/kernel/qplatformprintplugin.cpp
index ec068d87d1..854d8810cc 100644
--- a/src/printsupport/kernel/qplatformprintplugin.cpp
+++ b/src/printsupport/kernel/qplatformprintplugin.cpp
@@ -70,13 +70,9 @@ QPlatformPrinterSupport *QPlatformPrinterSupportPlugin::get()
 {
     static QPlatformPrinterSupport *singleton = 0;
     if (!singleton) {
-        QStringList k = loader()->keys();
-        if (k.isEmpty())
-            return 0;
-        QPlatformPrinterSupportPlugin *plugin = qobject_cast<QPlatformPrinterSupportPlugin *>(loader()->instance(k.first()));
-        if (!plugin)
-            return 0;
-        singleton = plugin->create(k.first());
+        const QMultiMap<int, QString> keyMap = loader()->keyMap();
+        if (!keyMap.isEmpty())
+            singleton = qLoadPlugin<QPlatformPrinterSupport, QPlatformPrinterSupportPlugin>(loader(), keyMap.constBegin().value());
     }
     return singleton;
 }
-- 
cgit v1.2.3