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

QmlDesigner: Fallback to application Qt

Browse Source 
If the kit has no Qt it would return an empty path. That leads to errors
later. In that case the application Qt is used.

Change-Id: Ie5e755bb1f1ada80ea0e565756689a4acc3499fe
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2024-10-21 08:54:07 +02:00
parent fa5d5b4e0d
commit 18ca16cb25
1 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qmldesigner/qmldesignerprojectmanager.cpp
View File

@@ -354,26 +354,13 @@ void QmlDesignerProjectManager::editorsClosed(const QList<::Core::IEditor *> &)
namespace { namespace {
QtSupport::QtVersion *getQtVersion(::ProjectExplorer::Target *target) QString qmlPath(::ProjectExplorer::Target *target)
{
if (target)
return QtSupport::QtKitAspect::qtVersion(target->kit());
return {};
}
[[maybe_unused]] QtSupport::QtVersion *getQtVersion(::ProjectExplorer::Project *project)
{
return getQtVersion(project->activeTarget());
}
Utils::FilePath qmlPath(::ProjectExplorer::Target *target)
{ {
auto qt = QtSupport::QtKitAspect::qtVersion(target->kit()); auto qt = QtSupport::QtKitAspect::qtVersion(target->kit());
if (qt) if (qt)
return qt->qmlPath(); return qt->qmlPath().path();
return {}; return QLibraryInfo::path(QLibraryInfo::QmlImportsPath);
} }
[[maybe_unused]] void projectQmldirPaths(::ProjectExplorer::Target *target, QStringList &qmldirPaths) [[maybe_unused]] void projectQmldirPaths(::ProjectExplorer::Target *target, QStringList &qmldirPaths)
@@ -388,7 +375,7 @@ Utils::FilePath qmlPath(::ProjectExplorer::Target *target)
[[maybe_unused]] void qtQmldirPaths(::ProjectExplorer::Target *target, QStringList &qmldirPaths) [[maybe_unused]] void qtQmldirPaths(::ProjectExplorer::Target *target, QStringList &qmldirPaths)
{ {
if constexpr (useProjectStorage()) { if constexpr (useProjectStorage()) {
auto qmlRootPath = qmlPath(target).toString(); auto qmlRootPath = qmlPath(target);
qmldirPaths.push_back(qmlRootPath + "/QtQml"); qmldirPaths.push_back(qmlRootPath + "/QtQml");
qmldirPaths.push_back(qmlRootPath + "/QtQuick"); qmldirPaths.push_back(qmlRootPath + "/QtQuick");
qmldirPaths.push_back(qmlRootPath + "/QtQuick3D"); qmldirPaths.push_back(qmlRootPath + "/QtQuick3D");
@@ -443,7 +430,7 @@ Utils::FilePath qmlPath(::ProjectExplorer::Target *target)
QStringList qmldirPaths; QStringList qmldirPaths;
qmldirPaths.reserve(2); qmldirPaths.reserve(2);
const QString qmlRootPath = qmlPath(target).toString(); const QString qmlRootPath = qmlPath(target);
qmldirPaths.append(qmlRootPath + "/builtins.qmltypes"); qmldirPaths.append(qmlRootPath + "/builtins.qmltypes");
qmldirPaths.append(qmlRootPath + "/jsroot.qmltypes"); qmldirPaths.append(qmlRootPath + "/jsroot.qmltypes");