Merge remote-tracking branch 'origin/6.0'

Change-Id: I55d228482ceda144f903fb85eef048d53602ad18
2022-01-24 10:34:10 +01:00
parent da225e0784 f55ec2f930
commit 51d23ad64f
18 changed files with 238 additions and 53 deletions
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -340,6 +340,13 @@ QStringList QmlBuildSystem::customFileSelectors() const
    return {};
 }

+bool QmlBuildSystem::multilanguageSupport() const
+{
+    if (m_projectItem)
+        return m_projectItem->multilanguageSupport();
+    return false;
+}
+
 QStringList QmlBuildSystem::supportedLanguages() const
 {
    if (m_projectItem)