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

Merge remote-tracking branch 'origin/14.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	src/plugins/qmljseditor/qmljseditordocument.cpp

Change-Id: Ibef70b4c0eba5ccd5da7b05ca2bd3a9e8ee1cc0c
This commit is contained in:
Eike Ziller
2024-07-17 11:43:34 +02:00
parent 75e5b46ec0 01bfa99a92
commit 18937fd44b
87 changed files with 1276 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmljseditor/qmljseditordocument.cpp
View File

@@ -480,6 +480,11 @@ QmlJSEditorDocumentPrivate::QmlJSEditorDocumentPrivate(QmlJSEditorDocument *pare
this, &QmlJSEditorDocumentPrivate::onDocumentUpdated);
connect(QmllsSettingsManager::instance(), &QmllsSettingsManager::settingsChanged,
this, &QmlJSEditorDocumentPrivate::settingsChanged);
connect(
modelManager,
&ModelManagerInterface::projectInfoUpdated,
this,
&QmlJSEditorDocumentPrivate::settingsChanged);
// semantic info
m_semanticInfoUpdater = new SemanticInfoUpdater();
@@ -749,7 +754,7 @@ static FilePath qmllsForFile(const FilePath &file, QmlJS::ModelManagerInterface
< QmlJsEditingSettings::mininumQmllsVersion) {
return {};
}
return pInfo.qmllsPath;
return pInfo.qmllsPath.exists() ? pInfo.qmllsPath : Utils::FilePath();
}
void QmlJSEditorDocumentPrivate::settingsChanged()