Merge remote-tracking branch 'origin/4.14'

Conflicts:
	src/plugins/qmldesigner/assetexporterplugin/componentexporter.cpp

Change-Id: If742bcd843cf75cf55e07b489ecb7211f0cd9058
This commit is contained in:
Eike Ziller
2021-01-18 11:50:32 +01:00
16 changed files with 153 additions and 47 deletions

View File

@@ -498,6 +498,7 @@ void ProjectTreeWidget::setCurrentItem(Node *node)
}
} else {
m_view->clearSelection();
m_view->setCurrentIndex({});
}
}