summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@nokia.com>2012-05-08 12:02:51 +0200
committerDaniel Teske <daniel.teske@nokia.com>2012-05-08 14:06:17 +0200
commitcc3dd6532995c88a2435528867c8566ba904ce41 (patch)
tree8e1de2e199530b60b496279d5e4d4da832a822dc /src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
parente8ee898864dee2b7e7fef7656ea030ab9d85332b (diff)
downloadqt-creator-cc3dd6532995c88a2435528867c8566ba904ce41.tar.gz
Qt run configurations: emit enabledChanged if the disable reason changed
Otherwise a misparse might get reported as .pro parsing still in progress. Change-Id: I0958032c7692faa4672410f395ededf6f1a2e379 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp')
-rw-r--r--src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
index 2c9e9512b4..7c1d217c32 100644
--- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
@@ -146,9 +146,9 @@ bool Qt4RunConfiguration::isEnabled() const
QString Qt4RunConfiguration::disabledReason() const
{
if (m_parseInProgress)
- return tr("The .pro file is currently being parsed.");
+ return tr("The .pro file '%1' is currently being parsed.").arg(QFileInfo(m_proFilePath).fileName());
if (!m_parseSuccess)
- return tr("The .pro file could not be parsed.");
+ return tr("The .pro file '%1' could not be parsed.").arg(QFileInfo(m_proFilePath).fileName());
return QString();
}
@@ -164,9 +164,10 @@ void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro,
}
bool enabled = isEnabled();
+ QString reason = disabledReason();
m_parseSuccess = success;
m_parseInProgress = parseInProgress;
- if (enabled != isEnabled())
+ if (enabled != isEnabled() || reason != disabledReason())
emit enabledChanged();
if (!parseInProgress) {