From e8b3b8140bd5d1ce6dc5b3874c508643656928f7 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 21 Mar 2017 10:33:02 +0100 Subject: [PATCH] QmlDesigner: Ensure design mode is registered We have to call registerDesignWidget() in extensionsInitialized() and not delayedInitialize(), because the setup of Qt Creator is already done when delayedInitialize() is called. Because of this, if the original widget designer was disabled, no design mode was available. Change-Id: I8b02fcb10aa5305aff3c700f7831012ccf009b33 Reviewed-by: Orgad Shaneh Reviewed-by: Tim Jenssen --- src/plugins/qmldesigner/qmldesignerplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index c1a48b95ad7..366e69bd641 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -188,7 +188,6 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e bool QmlDesignerPlugin::delayedInitialize() { - integrateIntoQtCreator(d->mainWidget); // adding default path to item library plugins const QString pluginPath = Utils::HostOsInfo::isMacHost() ? QString(QCoreApplication::applicationDirPath() + "/../PlugIns/QmlDesigner") @@ -210,6 +209,7 @@ bool QmlDesignerPlugin::delayedInitialize() void QmlDesignerPlugin::extensionsInitialized() { + integrateIntoQtCreator(d->mainWidget); } static QStringList allUiQmlFilesforCurrentProject(const Utils::FileName &fileName)