QMake: Fix that qmake was run on every build on macOS

The commit a71d725e46cf694867400be2bd079b699e62301a which fixed issues
on ARM Macs also removed logic for CONFIG+=<arch> arguments to qmake,
which was removed from qmake in Qt 5.6 (since PPC and 32bit Macs are no
longer supported or relevant, qbase f58e95f098c8d78a5f2db7729606126fe093cbdf).

The commit only removed part of the logic though, leading to the
Makefile parser and the qmake step disagreeing on the architecture of
the last qmake run, leading to the qmake step being executed again.

Remove the whole architecture detection and matching logic from
everywhere, which only did anything meaningful on macOS, and is not
needed there anymore either.

Fixes: QTCREATORBUG-26212
Change-Id: Ib60ebca1143296194454a63992ab90a97fdb56b6
Reviewed-by: Tor Arne Vestbø <[email protected]>
Reviewed-by: Christian Kandeler <[email protected]>

1 files changed, 0 insertions, 22 deletions

diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp
index 04048801b21..1343b5fde58 100644
--- a/src/plugins/qmakeprojectmanager/makefileparse.cpp
+++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp
@@ -160,26 +160,6 @@ QList<QMakeAssignment> MakeFileParse::parseAssignments(const QList<QMakeAssignme
                         m_qmakeBuildConfig.explicitBuildAll = false;
                         m_qmakeBuildConfig.explicitNoBuildAll = true;
                     }
-                } else if (value == QLatin1String("x86")) {
-                    if (qa.op == QLatin1String("+="))
-                        m_config.archConfig = QMakeStepConfig::X86;
-                    else
-                        m_config.archConfig = QMakeStepConfig::NoArch;
-                } else if (value == QLatin1String("x86_64")) {
-                    if (qa.op == QLatin1String("+="))
-                        m_config.archConfig = QMakeStepConfig::X86_64;
-                    else
-                        m_config.archConfig = QMakeStepConfig::NoArch;
-                } else if (value == QLatin1String("ppc")) {
-                    if (qa.op == QLatin1String("+="))
-                        m_config.archConfig = QMakeStepConfig::PowerPC;
-                    else
-                        m_config.archConfig = QMakeStepConfig::NoArch;
-                } else if (value == QLatin1String("ppc64")) {
-                    if (qa.op == QLatin1String("+="))
-                        m_config.archConfig = QMakeStepConfig::PowerPC64;
-                    else
-                        m_config.archConfig = QMakeStepConfig::NoArch;
                 } else if (value == QLatin1String("iphonesimulator")) {
                     if (qa.op == QLatin1String("+="))
                         m_config.osType = QMakeStepConfig::IphoneSimulator;
@@ -378,7 +358,6 @@ void MakeFileParse::parseCommandLine(const QString &command, const QString &proj
     qCDebug(logging()) << "  Explicit Release" << m_qmakeBuildConfig.explicitRelease;
     qCDebug(logging()) << "  Explicit BuildAll" << m_qmakeBuildConfig.explicitBuildAll;
     qCDebug(logging()) << "  Explicit NoBuildAll" << m_qmakeBuildConfig.explicitNoBuildAll;
-    qCDebug(logging()) << "  TargetArch" << m_config.archConfig;
     qCDebug(logging()) << "  OsType" << m_config.osType;
     qCDebug(logging()) << "  LinkQmlDebuggingQQ2"
                        << (m_config.linkQmlDebuggingQQ2 == TriState::Enabled);
@@ -532,7 +511,6 @@ void QmakeProjectManagerPlugin::testMakefileParser()
     QCOMPARE(parser.effectiveBuildConfig({}), effectiveBuildConfig);
 
     const QMakeStepConfig qmsc = parser.config();
-    QCOMPARE(qmsc.archConfig, static_cast<QMakeStepConfig::TargetArchConfig>(archConfig));
     QCOMPARE(qmsc.osType, static_cast<QMakeStepConfig::OsType>(osType));
     QCOMPARE(qmsc.linkQmlDebuggingQQ2 == TriState::Enabled, linkQmlDebuggingQQ2);
     QCOMPARE(qmsc.useQtQuickCompiler == TriState::Enabled, useQtQuickCompiler);