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

QmlDesigner: Support builtins qmltypes

Browse Source 
Task-number: QDS-6094
Change-Id: I1c3084b911b2918a9d185321dceb5ac409a8d438
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2022-02-15 15:10:30 +01:00
parent 4317c52a09
commit bd8e0796c2
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,7 +196,7 @@ void QmlDesignerProjectManager::editorsClosed(const QList<::Core::IEditor *> &)
namespace { namespace {
QtSupport::BaseQtVersion *getBaseQtVersion(::ProjectExplorer::Target *target) QtSupport::QtVersion *getQtVersion(::ProjectExplorer::Target *target)
{ {
if (target) if (target)
return QtSupport::QtKitAspect::qtVersion(target->kit()); return QtSupport::QtKitAspect::qtVersion(target->kit());
@@ -204,9 +204,9 @@ QtSupport::BaseQtVersion *getBaseQtVersion(::ProjectExplorer::Target *target)
return {}; return {};
} }
QtSupport::BaseQtVersion *getBaseQtVersion(::ProjectExplorer::Project *project) QtSupport::QtVersion *getQtVersion(::ProjectExplorer::Project *project)
{ {
return getBaseQtVersion(project->activeTarget()); return getQtVersion(project->activeTarget());
} }
Utils::FilePath qmlPath(::ProjectExplorer::Target *target) Utils::FilePath qmlPath(::ProjectExplorer::Target *target)
@@ -262,6 +262,22 @@ QStringList qmlDirs(::ProjectExplorer::Target *target)
return qmldirPaths; return qmldirPaths;
} }
QStringList qmlTypes(::ProjectExplorer::Target *target)
{
if (!target)
return {};
QStringList qmldirPaths;
qmldirPaths.reserve(2);
const QString installDirectory = qmlPath(target).toString();
qmldirPaths.append(installDirectory + "/builtins.qmltypes");
qmldirPaths.append(installDirectory + "/jsroot.qmltypes");
return qmldirPaths;
}
} // namespace } // namespace
void QmlDesignerProjectManager::projectAdded(::ProjectExplorer::Project *project) void QmlDesignerProjectManager::projectAdded(::ProjectExplorer::Project *project)