forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/13.0'
Conflicts: src/plugins/languageclient/languageclientutils.cpp Change-Id: I8d1945f79d93cecee9b22f409bc5f2eefaf6a4cd
This commit is contained in:
@@ -750,6 +750,9 @@ static Utils::FilePath qmllsForFile(const Utils::FilePath &file,
|
||||
|
||||
void QmlJSEditorDocumentPrivate::settingsChanged()
|
||||
{
|
||||
if (q->isTemporary())
|
||||
return;
|
||||
|
||||
Utils::FilePath newQmlls = qmllsForFile(q->filePath(), ModelManagerInterface::instance());
|
||||
if (m_qmllsStatus.qmllsPath == newQmlls)
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user