Merge remote-tracking branch 'origin/11.0' into work

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs

Change-Id: Ib4653a1ce75c7cce658f4bb843481de014d0fcf7
This commit is contained in:
Eike Ziller
2023-06-26 12:12:58 +02:00
27 changed files with 137 additions and 85 deletions

View File

@@ -87,6 +87,9 @@ void MesonBuildSystem::parsingCompleted(bool success)
UNLOCK(false);
emitBuildSystemUpdated();
}
emitParsingFinished(success);
emit buildConfiguration()->enabledChanged(); // HACK. Should not be needed.
}
ProjectExplorer::Kit *MesonBuildSystem::MesonBuildSystem::kit()