From aa0440474c24cf7979e2566e24c61095975b0122 Mon Sep 17 00:00:00 2001
From: hjk <qthjk@ovi.com>
Date: Wed, 16 Jan 2013 19:06:02 +0100
Subject: [PATCH] Fix crash on startup

Even in Magic Land it's a good idea to have an upper bound of one on
the number of instances of a singleton types.

Task-number: QTCREATORBUG-8578
Change-Id: I5c426493b85e0df9e2460ac2ef8f530be2847236
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
---
 src/plugins/qmldesigner/qmldesignerplugin.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmldesigner/qmldesignerplugin.h b/src/plugins/qmldesigner/qmldesignerplugin.h
index 1be23154187..b42d4cd5530 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.h
+++ b/src/plugins/qmldesigner/qmldesignerplugin.h
@@ -31,11 +31,10 @@
 #define QMLDESIGNERPLUGIN_H
 
 #include <qmldesigner/designersettings.h>
+#include <qmldesigner/components/pluginmanager/pluginmanager.h>
 
 #include <extensionsystem/iplugin.h>
 
-#include <extensionsystem/pluginmanager.h>
-
 #include <QWeakPointer>
 #include <QStringList>
 
@@ -89,7 +88,7 @@ private:
     QStringList m_mimeTypes;
     DesignModeWidget *m_mainWidget;
 
-    ExtensionSystem::PluginManager m_pluginManager;
+    QmlDesigner::PluginManager m_pluginManager;
     static BauhausPlugin *m_pluginInstance;
     DesignerSettings m_settings;
     DesignModeContext *m_context;