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

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	src/libs/utils/processreaper.cpp
	src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
	src/plugins/cmakeprojectmanager/cmakeprocess.cpp

Change-Id: Ie248bcb02a80f3e02ab19d73033ce2ba31e7fd83
This commit is contained in:
Eike Ziller
2021-09-07 08:56:42 +02:00
parent d739ba8a7d 93857c279c
commit 8e51295959
101 changed files with 1050 additions and 663 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -185,7 +185,6 @@ QMakeStepConfig QMakeStep::deducedArguments() const
BaseQtVersion *version = QtKitAspect::qtVersion(kit);
config.archConfig = QMakeStepConfig::targetArchFor(targetAbi, version);
config.osType = QMakeStepConfig::osTypeFor(targetAbi, version);
config.separateDebugInfo = qmakeBuildConfiguration()->separateDebugInfo();
config.linkQmlDebuggingQQ2 = qmakeBuildConfiguration()->qmlDebugging();
@@ -780,25 +779,9 @@ QMakeStepFactory::QMakeStepFactory()
setFlags(BuildStepInfo::UniqueStep);
}
QMakeStepConfig::TargetArchConfig QMakeStepConfig::targetArchFor(const Abi &targetAbi, const BaseQtVersion *version)
QMakeStepConfig::TargetArchConfig QMakeStepConfig::targetArchFor(const Abi &, const BaseQtVersion *)
{
TargetArchConfig arch = NoArch;
if (!version || version->type() != QtSupport::Constants::DESKTOPQT)
return arch;
if (targetAbi.os() == Abi::DarwinOS && targetAbi.binaryFormat() == Abi::MachOFormat) {
if (targetAbi.architecture() == Abi::X86Architecture) {
if (targetAbi.wordWidth() == 32)
arch = X86;
else if (targetAbi.wordWidth() == 64)
arch = X86_64;
} else if (targetAbi.architecture() == Abi::PowerPCArchitecture) {
if (targetAbi.wordWidth() == 32)
arch = PowerPC;
else if (targetAbi.wordWidth() == 64)
arch = PowerPC64;
}
}
return arch;
return NoArch;
}
QMakeStepConfig::OsType QMakeStepConfig::osTypeFor(const Abi &targetAbi, const BaseQtVersion *version)