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

MSVC: Add missing operator ==

Browse Source 
Unbreaks MSCV toolchain registration.

Task-number: QTCREATORBUG-6875
Change-Id: I55e52251ca1621320b5f9db022bab8d79f19030e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Tobias Hunger
2012-01-30 14:25:44 +01:00
parent 9da98805dd
commit b7c322c84b
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/projectexplorer/abstractmsvctoolchain.cpp
View File

@@ -274,6 +274,18 @@ QString AbstractMsvcToolChain::findInstalledJom()
return jom; return jom;
} }
bool AbstractMsvcToolChain::operator ==(const ToolChain &other) const
{
if (!ToolChain::operator ==(other))
return false;
const AbstractMsvcToolChain *msvcTc = static_cast<const AbstractMsvcToolChain *>(&other);
return targetAbi() == msvcTc->targetAbi()
&& m_debuggerCommand == msvcTc->m_debuggerCommand
&& m_vcvarsBat == msvcTc->m_vcvarsBat;
}
} // namespace Internal } // namespace Internal
} // namespace ProjectExplorer } // namespace ProjectExplorer

3
src/plugins/projectexplorer/abstractmsvctoolchain.h
View File

@@ -65,6 +65,9 @@ public:
QString varsBat() const { return m_vcvarsBat; } QString varsBat() const { return m_vcvarsBat; }
static QString findInstalledJom(); static QString findInstalledJom();
bool operator ==(const ToolChain &) const;
protected: protected:
virtual Utils::Environment readEnvironmentSetting(Utils::Environment& env) const = 0; virtual Utils::Environment readEnvironmentSetting(Utils::Environment& env) const = 0;
virtual QByteArray msvcPredefinedMacros(const Utils::Environment& env) const; virtual QByteArray msvcPredefinedMacros(const Utils::Environment& env) const;