feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri

Change-Id: Ic02df53b880d0861d9d9ea0df3e0d381ae99f350
This commit is contained in:
Eike Ziller
2022-03-11 09:50:48 +01:00
parent a863958aa4 2829412e15
commit cd8c4ced81
184 changed files with 3566 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -234,7 +234,7 @@ FilePath CMakeTool::qchFilePath() const
FilePath CMakeTool::cmakeExecutable(const FilePath &path)
{
if (HostOsInfo::isMacHost()) {
if (path.osType() == OsTypeMac) {
const QString executableString = path.toString();
const int appIndex = executableString.lastIndexOf(".app");
const int appCutIndex = appIndex + 4;
@@ -251,7 +251,7 @@ FilePath CMakeTool::cmakeExecutable(const FilePath &path)
const FilePath resolvedPath = path.canonicalPath();
// Evil hack to make snap-packages of CMake work. See QTCREATORBUG-23376
if (HostOsInfo::isLinuxHost() && resolvedPath.fileName() == "snap")
if (path.osType() == OsTypeLinux && resolvedPath.fileName() == "snap")
return path;
return resolvedPath;