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

Merge remote-tracking branch 'gerrit/2.6'

Browse Source 
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
This commit is contained in:
Oswald Buddenhagen
2012-09-12 17:27:37 +02:00
parent c12cefbb51 77a6b71f72
commit e730e2bb8a
93 changed files with 880 additions and 690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -566,11 +566,11 @@ class AbiKitMatcher : public KitMatcher
{
public:
explicit AbiKitMatcher(const QList<Abi> &abis) : m_abis(abis) {}
bool matches(const Kit *p) const
bool matches(const Kit *k) const
{
if (const ToolChain *tc = ToolChainKitInformation::toolChain(p)) {
if (const ToolChain *tc = ToolChainKitInformation::toolChain(k)) {
return m_abis.contains(tc->targetAbi())
&& DebuggerKitInformation::isValidDebugger(p);
&& DebuggerKitInformation::isValidDebugger(k);
}
return false;
}
@@ -583,11 +583,11 @@ class CompatibleAbiKitMatcher : public KitMatcher
{
public:
explicit CompatibleAbiKitMatcher(const QList<Abi> &abis) : m_abis(abis) {}
bool matches(const Kit *p) const
bool matches(const Kit *k) const
{
if (const ToolChain *tc = ToolChainKitInformation::toolChain(p))
if (const ToolChain *tc = ToolChainKitInformation::toolChain(k))
foreach (const Abi &a, m_abis)
if (a.isCompatibleWith(tc->targetAbi()) && DebuggerKitInformation::isValidDebugger(p))
if (a.isCompatibleWith(tc->targetAbi()) && DebuggerKitInformation::isValidDebugger(k))
return true;
return false;
}