From 5f61381cba8ce44baf5f9971f65fe5254e86056c Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 16 Jan 2019 16:24:02 +0100 Subject: GccToolChain: Respect user changes to the ABI Upon restoring toolchain settings, we would overwrite the ABI with an auto-detected value if it contained any "unknown" parts. Fixes: QTCREATORBUG-19896 Change-Id: I38fd704da2c12603961a125fb779eca625815246 Reviewed-by: Eike Ziller --- src/plugins/projectexplorer/gcctoolchain.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index bee5cdcce8..004b362a3c 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -787,7 +787,8 @@ bool GccToolChain::fromMap(const QVariantMap &data) m_compilerCommand = FileName::fromString(data.value(compilerCommandKeyC).toString()); m_platformCodeGenFlags = data.value(compilerPlatformCodeGenFlagsKeyC).toStringList(); m_platformLinkerFlags = data.value(compilerPlatformLinkerFlagsKeyC).toStringList(); - m_targetAbi = Abi::fromString(data.value(targetAbiKeyC).toString()); + const QString targetAbiString = data.value(targetAbiKeyC).toString(); + m_targetAbi = Abi::fromString(targetAbiString); m_originalTargetTriple = data.value(originalTargetTripleKeyC).toString(); const QStringList abiList = data.value(supportedAbisKeyC).toStringList(); m_supportedAbis.clear(); @@ -798,7 +799,7 @@ bool GccToolChain::fromMap(const QVariantMap &data) m_supportedAbis.append(abi); } - if (!m_targetAbi.isValid()) + if (targetAbiString.isEmpty()) resetToolChain(m_compilerCommand); return true; -- cgit v1.2.3