From a078f7187224567743a136b26d181feffcab889d Mon Sep 17 00:00:00 2001 From: dt_ Date: Thu, 26 May 2011 15:56:36 +0200 Subject: [PATCH] Add BuildConfiguration::disabledReason() Not yet used. Change-Id: I1f8763163e5f19e41d8e98517cf13d9bbb1e6ff8 Reviewed-on: http://codereview.qt.nokia.com/189 Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/buildconfiguration.cpp | 5 +++++ src/plugins/projectexplorer/buildconfiguration.h | 1 + src/plugins/qt4projectmanager/qt4buildconfiguration.cpp | 7 +++++++ src/plugins/qt4projectmanager/qt4buildconfiguration.h | 1 + 4 files changed, 14 insertions(+) diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp index 2a7d2a1b99a..43fdefdfb01 100644 --- a/src/plugins/projectexplorer/buildconfiguration.cpp +++ b/src/plugins/projectexplorer/buildconfiguration.cpp @@ -279,6 +279,11 @@ bool BuildConfiguration::isEnabled() const return true; } +QString BuildConfiguration::disabledReason() const +{ + return QString(); +} + bool BuildConfigMacroExpander::resolveMacro(const QString &name, QString *ret) { if (name == QLatin1String("sourceDir")) { diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h index 39816796a17..b7cada3afb0 100644 --- a/src/plugins/projectexplorer/buildconfiguration.h +++ b/src/plugins/projectexplorer/buildconfiguration.h @@ -92,6 +92,7 @@ public: Target *target() const; virtual bool isEnabled() const; + virtual QString disabledReason() const; Utils::AbstractMacroExpander *macroExpander() { return &m_macroExpander; } diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index a287c155367..2dc21e7691f 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp @@ -631,6 +631,13 @@ bool Qt4BuildConfiguration::isEnabled() const return m_isEnabled; } +QString Qt4BuildConfiguration::disabledReason() const +{ + if (!m_isEnabled) + return tr("Parsing the .pro file"); + return QString(); +} + void Qt4BuildConfiguration::setEnabled(bool enabled) { if (m_isEnabled == enabled) diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h index 9e57e615012..05692b5413a 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h @@ -117,6 +117,7 @@ public: ProjectExplorer::IOutputParser *createOutputParser() const; virtual bool isEnabled() const; + virtual QString disabledReason() const; /// \internal For Qt4Project, since that manages the parsing information void setEnabled(bool enabled);