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

QmakeProjectManager: Some code cosmetics

Browse Source 
Namespaces, foreach, parantheses.

Change-Id: I641811d66970cbb275688a73c8765be00ba295bb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-04-23 04:19:14 +02:00
parent 29ac812cf4
commit 9dfdb9f0a2
1 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ const char QMAKE_ARGUMENTS_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeArgumen
const char QMAKE_FORCED_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeForced"; const char QMAKE_FORCED_KEY[] = "QtProjectManager.QMakeBuildStep.QMakeForced";
const char QMAKE_SELECTED_ABIS_KEY[] = "QtProjectManager.QMakeBuildStep.SelectedAbis"; const char QMAKE_SELECTED_ABIS_KEY[] = "QtProjectManager.QMakeBuildStep.SelectedAbis";
QMakeStep::QMakeStep(BuildStepList *bsl, Utils::Id id) QMakeStep::QMakeStep(BuildStepList *bsl, Id id)
: AbstractProcessStep(bsl, id) : AbstractProcessStep(bsl, id)
{ {
setLowPriority(); setLowPriority();
@@ -162,7 +162,7 @@ QString QMakeStep::allArguments(const BaseQtVersion *v, ArgumentFlags flags) con
QString args = QtcProcess::joinArgs(arguments); QString args = QtcProcess::joinArgs(arguments);
// User arguments // User arguments
QtcProcess::addArgs(&args, userArguments()); QtcProcess::addArgs(&args, userArguments());
foreach (QString arg, m_extraArgs) for (QString arg : qAsConst(m_extraArgs))
QtcProcess::addArgs(&args, arg); QtcProcess::addArgs(&args, arg);
return (flags & ArgumentFlag::Expand) ? bc->macroExpander()->expand(args) : args; return (flags & ArgumentFlag::Expand) ? bc->macroExpander()->expand(args) : args;
} }
@@ -263,7 +263,7 @@ bool QMakeStep::init()
if (!tasks.isEmpty()) { if (!tasks.isEmpty()) {
bool canContinue = true; bool canContinue = true;
foreach (const ProjectExplorer::Task &t, tasks) { for (const Task &t : qAsConst(tasks)) {
emit addTask(t); emit addTask(t);
if (t.type == Task::Error) if (t.type == Task::Error)
canContinue = false; canContinue = false;
@@ -419,10 +419,10 @@ QString QMakeStep::makeArguments(const QString &makefile) const
{ {
QString args; QString args;
if (!makefile.isEmpty()) { if (!makefile.isEmpty()) {
Utils::QtcProcess::addArg(&args, "-f"); QtcProcess::addArg(&args, "-f");
Utils::QtcProcess::addArg(&args, makefile); QtcProcess::addArg(&args, makefile);
} }
Utils::QtcProcess::addArg(&args, "qmake_all"); QtcProcess::addArg(&args, "qmake_all");
return args; return args;
} }
@@ -749,39 +749,36 @@ QMakeStepFactory::QMakeStepFactory()
QMakeStepConfig::TargetArchConfig QMakeStepConfig::targetArchFor(const Abi &targetAbi, const BaseQtVersion *version) QMakeStepConfig::TargetArchConfig QMakeStepConfig::targetArchFor(const Abi &targetAbi, const BaseQtVersion *version)
{ {
QMakeStepConfig::TargetArchConfig arch = QMakeStepConfig::NoArch; TargetArchConfig arch = NoArch;
if (!version || version->type() != QtSupport::Constants::DESKTOPQT) if (!version || version->type() != QtSupport::Constants::DESKTOPQT)
return arch; return arch;
if ((targetAbi.os() == ProjectExplorer::Abi::DarwinOS) if (targetAbi.os() == Abi::DarwinOS && targetAbi.binaryFormat() == Abi::MachOFormat) {
&& (targetAbi.binaryFormat() == ProjectExplorer::Abi::MachOFormat)) { if (targetAbi.architecture() == Abi::X86Architecture) {
if (targetAbi.architecture() == ProjectExplorer::Abi::X86Architecture) {
if (targetAbi.wordWidth() == 32) if (targetAbi.wordWidth() == 32)
arch = QMakeStepConfig::X86; arch = X86;
else if (targetAbi.wordWidth() == 64) else if (targetAbi.wordWidth() == 64)
arch = QMakeStepConfig::X86_64; arch = X86_64;
} else if (targetAbi.architecture() == ProjectExplorer::Abi::PowerPCArchitecture) { } else if (targetAbi.architecture() == Abi::PowerPCArchitecture) {
if (targetAbi.wordWidth() == 32) if (targetAbi.wordWidth() == 32)
arch = QMakeStepConfig::PowerPC; arch = PowerPC;
else if (targetAbi.wordWidth() == 64) else if (targetAbi.wordWidth() == 64)
arch = QMakeStepConfig::PowerPC64; arch = PowerPC64;
} }
} }
return arch; return arch;
} }
QMakeStepConfig::OsType QMakeStepConfig::osTypeFor(const ProjectExplorer::Abi &targetAbi, const BaseQtVersion *version) QMakeStepConfig::OsType QMakeStepConfig::osTypeFor(const Abi &targetAbi, const BaseQtVersion *version)
{ {
QMakeStepConfig::OsType os = QMakeStepConfig::NoOsType; OsType os = NoOsType;
const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios"; const char IOSQT[] = "Qt4ProjectManager.QtVersion.Ios";
if (!version || version->type() != IOSQT) if (!version || version->type() != IOSQT)
return os; return os;
if ((targetAbi.os() == ProjectExplorer::Abi::DarwinOS) if (targetAbi.os() == Abi::DarwinOS && targetAbi.binaryFormat() == Abi::MachOFormat) {
&& (targetAbi.binaryFormat() == ProjectExplorer::Abi::MachOFormat)) { if (targetAbi.architecture() == Abi::X86Architecture)
if (targetAbi.architecture() == ProjectExplorer::Abi::X86Architecture) { os = IphoneSimulator;
os = QMakeStepConfig::IphoneSimulator; else if (targetAbi.architecture() == Abi::ArmArchitecture)
} else if (targetAbi.architecture() == ProjectExplorer::Abi::ArmArchitecture) { os = IphoneOS;
os = QMakeStepConfig::IphoneOS;
}
} }
return os; return os;
} }