diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp index a52f22c3d4c..8b63e87f47c 100644 --- a/src/plugins/qmakeprojectmanager/makefileparse.cpp +++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp @@ -167,12 +167,12 @@ void MakeFileParse::parseAssignments(QList *assignments) m_config.archConfig = QMakeStepConfig::NoArch; } else if (value == QLatin1String("ppc")) { if (qa.op == QLatin1String("+=")) - m_config.archConfig = QMakeStepConfig::PPC; + m_config.archConfig = QMakeStepConfig::PowerPC; else m_config.archConfig = QMakeStepConfig::NoArch; } else if (value == QLatin1String("ppc64")) { if (qa.op == QLatin1String("+=")) - m_config.archConfig = QMakeStepConfig::PPC64; + m_config.archConfig = QMakeStepConfig::PowerPC64; else m_config.archConfig = QMakeStepConfig::NoArch; } else if (value == QLatin1String("iphonesimulator")) { diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index 681b54f44a4..f067018960a 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -888,9 +888,9 @@ QMakeStepConfig::TargetArchConfig QMakeStepConfig::targetArchFor(const Abi &targ arch = QMakeStepConfig::X86_64; } else if (targetAbi.architecture() == ProjectExplorer::Abi::PowerPCArchitecture) { if (targetAbi.wordWidth() == 32) - arch = QMakeStepConfig::PPC; + arch = QMakeStepConfig::PowerPC; else if (targetAbi.wordWidth() == 64) - arch = QMakeStepConfig::PPC64; + arch = QMakeStepConfig::PowerPC64; } } return arch; @@ -920,9 +920,9 @@ QStringList QMakeStepConfig::toArguments() const arguments << QLatin1String("CONFIG+=x86"); else if (archConfig == X86_64) arguments << QLatin1String("CONFIG+=x86_64"); - else if (archConfig == PPC) + else if (archConfig == PowerPC) arguments << QLatin1String("CONFIG+=ppc"); - else if (archConfig == PPC64) + else if (archConfig == PowerPC64) arguments << QLatin1String("CONFIG+=ppc64"); // TODO: make that depend on the actual Qt version that is used diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index 08e20e24ce1..bc1d969ca68 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -71,7 +71,7 @@ class QMAKEPROJECTMANAGER_EXPORT QMakeStepConfig { public: enum TargetArchConfig { - NoArch, X86, X86_64, PPC, PPC64 + NoArch, X86, X86_64, PowerPC, PowerPC64 }; enum OsType { diff --git a/tests/manual/shootout/tst_codesize.cpp b/tests/manual/shootout/tst_codesize.cpp index 02762d879de..630053987f1 100644 --- a/tests/manual/shootout/tst_codesize.cpp +++ b/tests/manual/shootout/tst_codesize.cpp @@ -360,7 +360,7 @@ void tst_CodeSize::codesize_data() QByteArray std_tie_code = "struct QMakeStepConfig\n" "{\n" - " enum TargetArchConfig { NoArch, X86, X86_64, PPC, PPC64 };\n" + " enum TargetArchConfig { NoArch, X86, X86_64, PowerPC, PowerPC64 };\n" " enum OsType { NoOsType, IphoneSimulator, IphoneOS };\n" "\n" " QMakeStepConfig()\n"