Merge remote-tracking branch 'origin/6.0'

Change-Id: I3bab4e31bc5993c59c7025ebde0846bf6c75810e
This commit is contained in:
Eike Ziller
2021-11-19 10:44:15 +01:00
82 changed files with 706 additions and 229 deletions

View File

@@ -1014,7 +1014,7 @@ const QList<BuildTargetInfo> CMakeBuildSystem::appTargets() const
BuildTargetInfo bti;
bti.displayName = ct.title;
bti.targetFilePath = ct.executable;
bti.projectFilePath = ct.sourceDirectory.stringAppended("/");
bti.projectFilePath = ct.sourceDirectory.cleanPath();
bti.workingDirectory = ct.workingDirectory;
bti.buildKey = buildKey;
bti.usesTerminal = !ct.linksToQtGui;