From ad634b8cd2c28bd64ec4be25c87b73cc614022f5 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Thu, 21 Feb 2013 16:42:12 +0100
Subject: [PATCH] MsvcToolchains: Call AbstractMsvcToolChain::toMap() in
derived class
Even though AbstractMsvcToolChain::toMap() doesn't exist today,
calling the immediate super class is better.
Change-Id: If370046289aaf88890c26e91a4dfa2e4ed240bd9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/projectexplorer/msvctoolchain.cpp | 2 +-
src/plugins/projectexplorer/wincetoolchain.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 074d31425a1..ffa6873e5c6 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -376,7 +376,7 @@ QList<Utils::FileName> MsvcToolChain::suggestedMkspecList() const
QVariantMap MsvcToolChain::toMap() const
{
- QVariantMap data = ToolChain::toMap();
+ QVariantMap data = AbstractMsvcToolChain::toMap();
data.insert(QLatin1String(varsBatKeyC), m_vcvarsBat);
if (!m_varsBatArg.isEmpty())
data.insert(QLatin1String(varsBatArgKeyC), m_varsBatArg);
diff --git a/src/plugins/projectexplorer/wincetoolchain.cpp b/src/plugins/projectexplorer/wincetoolchain.cpp
index 923744edfa9..558658ded4e 100644
--- a/src/plugins/projectexplorer/wincetoolchain.cpp
+++ b/src/plugins/projectexplorer/wincetoolchain.cpp
@@ -308,7 +308,7 @@ QString WinCEToolChain::ceVer() const
QVariantMap WinCEToolChain::toMap() const
{
- QVariantMap data = ToolChain::toMap();
+ QVariantMap data = AbstractMsvcToolChain::toMap();
data.insert(QLatin1String(msvcVerKeyC), m_msvcVer);
data.insert(QLatin1String(ceVerKeyC), m_ceVer);
--
GitLab