From 6571bd51977ffe130c191a525ce94f9ff1d38a22 Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@qt.io>
Date: Wed, 20 Jan 2021 00:20:44 +0100
Subject: [PATCH] qmldesigner: do not use hardcoded path in plugin

Fixes: QTCREATORBUG-24737
Change-Id: I901b205bb6df7516d3cddf4cbc6d5a445ce2fb2f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 src/plugins/qmldesigner/qmldesignerplugin.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index 65191293691..1accc42be74 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -45,6 +45,8 @@
 #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>
@@ -233,7 +235,8 @@ bool QmlDesignerPlugin::delayedInitialize()
     const QString pluginPath = Utils::HostOsInfo::isMacHost()
             ? QString(QCoreApplication::applicationDirPath() + "/../PlugIns/QmlDesigner")
             : QString(QCoreApplication::applicationDirPath() + "/../"
-                      + QLatin1String(IDE_LIBRARY_BASENAME) + "/qtcreator/plugins/qmldesigner");
+                      + QLatin1String(IDE_LIBRARY_BASENAME) + "/" + Core::Constants::IDE_ID
+                      + "/plugins/qmldesigner");
     MetaInfo::setPluginPaths(QStringList(pluginPath));
 
     d->settings.fromSettings(Core::ICore::settings());