From 0904f6e836d27fdc5567a1ce7a57ce964a325233 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 14 Nov 2013 15:52:57 +0100 Subject: [PATCH] DebuggerItem: Fix restoration of ABIs We want to restore even partially valid ABIs (e.g. those where we are not 100% sure about the supported word width). This change fixes Mingw compilers that went missing from their kits after creator was reopened: The ABI did not get restored due to the word width not being set and the default host ABI was set instead. This then made the debugger no longer a match (msvc20x does not match msys!) and thus getting removed from its kit. Task-number: QTCREATORBUG-10463 Change-Id: Ie89c7aed2f092f3032860915c74655ff70dae77d Reviewed-by: hjk --- src/plugins/debugger/debuggeritem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/debugger/debuggeritem.cpp b/src/plugins/debugger/debuggeritem.cpp index d43fd32209a..c620e250bfc 100644 --- a/src/plugins/debugger/debuggeritem.cpp +++ b/src/plugins/debugger/debuggeritem.cpp @@ -79,7 +79,7 @@ DebuggerItem::DebuggerItem(const QVariantMap &data) foreach (const QString &a, data.value(QLatin1String(DEBUGGER_INFORMATION_ABIS)).toStringList()) { Abi abi(a); - if (abi.isValid()) + if (!abi.isNull()) m_abis.append(abi); } }