feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmldesigner: do not use hardcoded path in plugin

Browse Source 
Fixes: QTCREATORBUG-24737
Change-Id: I901b205bb6df7516d3cddf4cbc6d5a445ce2fb2f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Fawzi Mohamed
2021-01-20 00:20:44 +01:00
parent 44901a3863
commit 6571bd5197
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -45,6 +45,8 @@
#include <transitioneditor/transitioneditorview.h> #include <transitioneditor/transitioneditorview.h>
#include <pathtool/pathtool.h> #include <pathtool/pathtool.h>
#include <app/app_version.h>
#include <qmljseditor/qmljseditor.h> #include <qmljseditor/qmljseditor.h>
#include <qmljseditor/qmljseditorconstants.h> #include <qmljseditor/qmljseditorconstants.h>
#include <qmljseditor/qmljseditordocument.h> #include <qmljseditor/qmljseditordocument.h>
@@ -233,7 +235,8 @@ bool QmlDesignerPlugin::delayedInitialize()
const QString pluginPath = Utils::HostOsInfo::isMacHost() const QString pluginPath = Utils::HostOsInfo::isMacHost()
? QString(QCoreApplication::applicationDirPath() + "/../PlugIns/QmlDesigner") ? QString(QCoreApplication::applicationDirPath() + "/../PlugIns/QmlDesigner")
: QString(QCoreApplication::applicationDirPath() + "/../" : QString(QCoreApplication::applicationDirPath() + "/../"
+ QLatin1String(IDE_LIBRARY_BASENAME) + "/qtcreator/plugins/qmldesigner"); + QLatin1String(IDE_LIBRARY_BASENAME) + "/" + Core::Constants::IDE_ID
+ "/plugins/qmldesigner");
MetaInfo::setPluginPaths(QStringList(pluginPath)); MetaInfo::setPluginPaths(QStringList(pluginPath));
d->settings.fromSettings(Core::ICore::settings()); d->settings.fromSettings(Core::ICore::settings());