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

GccToolChain: Redetect ABIs if the targetAbi is invalid

Browse Source 
Fixes issues with broken ABIs in the settings, like you get when going
from QtCreator 4.2 to 4.1 and back.

Task-number: QTCREATORBUG-16823
Change-Id: Ibcab5d3bc8255dfeb647e512f5db1d94155f9d9a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2016-09-12 12:06:50 +02:00
parent e4e30b24e0
commit e57f8e9038
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -617,10 +617,7 @@ IOutputParser *GccToolChain::outputParser() const
void GccToolChain::resetToolChain(const FileName &path) void GccToolChain::resetToolChain(const FileName &path)
{ {
if (path == m_compilerCommand) bool resetDisplayName = (displayName() == defaultDisplayName());
return;
bool resetDisplayName = displayName() == defaultDisplayName();
setCompilerCommand(path); setCompilerCommand(path);
@@ -710,14 +707,18 @@ bool GccToolChain::fromMap(const QVariantMap &data)
m_platformLinkerFlags = data.value(QLatin1String(compilerPlatformLinkerFlagsKeyC)).toStringList(); m_platformLinkerFlags = data.value(QLatin1String(compilerPlatformLinkerFlagsKeyC)).toStringList();
m_targetAbi = Abi(data.value(QLatin1String(targetAbiKeyC)).toString()); m_targetAbi = Abi(data.value(QLatin1String(targetAbiKeyC)).toString());
m_originalTargetTriple = data.value(QLatin1String(originalTargetTripleKeyC)).toString(); m_originalTargetTriple = data.value(QLatin1String(originalTargetTripleKeyC)).toString();
QStringList abiList = data.value(QLatin1String(supportedAbisKeyC)).toStringList(); const QStringList abiList = data.value(QLatin1String(supportedAbisKeyC)).toStringList();
m_supportedAbis.clear(); m_supportedAbis.clear();
foreach (const QString &a, abiList) { for (const QString &a : abiList) {
Abi abi(a); Abi abi(a);
if (!abi.isValid()) if (!abi.isValid())
continue; continue;
m_supportedAbis.append(abi); m_supportedAbis.append(abi);
} }
if (!m_targetAbi.isValid())
resetToolChain(m_compilerCommand);
return true; return true;
} }