From 2f86e6d7b54d226576ebd52d84b578bb7b623365 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Wed, 3 Mar 2021 14:54:10 +0000
Subject: [PATCH] fix "qmldesigner: do not use hardcoded path in plugin"

-> 6571bd51977ffe130c191a525ce94f9ff1d38a22.

Change-Id: I62524ec88fed1d041227cf7d9ac97ff65b24af8a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/qmldesigner/qmldesignerplugin.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index d8c9f60f5ec..b7f003be676 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -45,8 +45,6 @@
 #include <transitioneditor/transitioneditorview.h>
 #include <pathtool/pathtool.h>
 
-#include <app/app_version.h>
-
 #include <qmljseditor/qmljseditor.h>
 #include <qmljseditor/qmljseditorconstants.h>
 #include <qmljseditor/qmljseditordocument.h>
@@ -62,6 +60,7 @@
 #include <coreplugin/messagebox.h>
 #include <coreplugin/modemanager.h>
 #include <coreplugin/editormanager/editormanager.h>
+#include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/pluginspec.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <projectexplorer/projectexplorerconstants.h>
@@ -71,6 +70,7 @@
 
 #include <utils/hostosinfo.h>
 #include <utils/qtcassert.h>
+#include <utils/algorithm.h>
 
 #include <QAction>
 #include <QTimer>
@@ -232,12 +232,12 @@ bool QmlDesignerPlugin::initialize(const QStringList & /*arguments*/, QString *e
 bool QmlDesignerPlugin::delayedInitialize()
 {
     // adding default path to item library plugins
-    const QString pluginPath = Utils::HostOsInfo::isMacHost()
-            ? QString(QCoreApplication::applicationDirPath() + "/../PlugIns/QmlDesigner")
-            : QString(QCoreApplication::applicationDirPath() + "/../"
-                      + QLatin1String(IDE_LIBRARY_BASENAME) + "/" + Core::Constants::IDE_ID
-                      + "/plugins/qmldesigner");
-    MetaInfo::setPluginPaths(QStringList(pluginPath));
+    const QString postfix = Utils::HostOsInfo::isMacHost() ? "/QmlDesigner" : "/qmldesigner";
+    const QStringList pluginPaths =
+        Utils::transform(ExtensionSystem::PluginManager::pluginPaths(), [postfix](const QString &p) {
+            return QString(p + postfix);
+        });
+    MetaInfo::setPluginPaths(pluginPaths);
 
     d->settings.fromSettings(Core::ICore::settings());