Merge remote-tracking branch 'origin/7.0'

Change-Id: I7037b2b400617b0be0e1a010dd293e4f96d77328
This commit is contained in:
Eike Ziller
2022-05-23 12:26:27 +02:00
35 changed files with 363 additions and 90 deletions

View File

@@ -128,7 +128,7 @@ QmlProject::QmlProject(const Utils::FilePath &fileName)
const Utils::FilePath mainUiFile = qmlBuildSystem->mainUiFilePath();
if (mainUiFile.completeSuffix() == "qi.qml" && mainUiFile.exists()) {
if (mainUiFile.completeSuffix() == "ui.qml" && mainUiFile.exists()) {
QTimer::singleShot(1000, [mainUiFile]() {
Core::EditorManager::openEditor(mainUiFile,
Utils::Id());