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

Qt run configurations: emit enabledChanged if the disable reason changed

Browse Source 
Otherwise a misparse might get reported as .pro parsing still in
progress.

Change-Id: I0958032c7692faa4672410f395ededf6f1a2e379
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Daniel Teske
2012-05-08 12:02:51 +02:00
parent e8ee898864
commit cc3dd65329
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
View File

@@ -146,9 +146,9 @@ bool Qt4RunConfiguration::isEnabled() const
QString Qt4RunConfiguration::disabledReason() const QString Qt4RunConfiguration::disabledReason() const
{ {
if (m_parseInProgress) 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) 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(); return QString();
} }
@@ -164,9 +164,10 @@ void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro,
} }
bool enabled = isEnabled(); bool enabled = isEnabled();
QString reason = disabledReason();
m_parseSuccess = success; m_parseSuccess = success;
m_parseInProgress = parseInProgress; m_parseInProgress = parseInProgress;
if (enabled != isEnabled()) if (enabled != isEnabled() || reason != disabledReason())
emit enabledChanged(); emit enabledChanged();
if (!parseInProgress) { if (!parseInProgress) {

9
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -113,9 +113,10 @@ void S60DeviceRunConfiguration::proFileUpdate(Qt4ProjectManager::Qt4ProFileNode
if (m_proFilePath != pro->path()) if (m_proFilePath != pro->path())
return; return;
bool enabled = isEnabled(); bool enabled = isEnabled();
QString reason = disabledReason();
m_validParse = success; m_validParse = success;
m_parseInProgress = parseInProgress; m_parseInProgress = parseInProgress;
if (enabled != isEnabled()) if (enabled != isEnabled() || reason != disabledReason())
emit enabledChanged(); emit enabledChanged();
if (!parseInProgress) if (!parseInProgress)
emit targetInformationChanged(); emit targetInformationChanged();
@@ -138,9 +139,11 @@ bool S60DeviceRunConfiguration::isEnabled() const
QString S60DeviceRunConfiguration::disabledReason() const QString S60DeviceRunConfiguration::disabledReason() const
{ {
if (m_parseInProgress) 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_validParse) if (!m_validParse)
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(); return QString();
} }

9
src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
View File

@@ -157,11 +157,13 @@ Qt4BuildConfiguration *RemoteLinuxRunConfiguration::activeQt4BuildConfiguration(
bool RemoteLinuxRunConfiguration::isEnabled() const bool RemoteLinuxRunConfiguration::isEnabled() const
{ {
if (d->parseInProgress) { if (d->parseInProgress) {
d->disabledReason = tr("The .pro file is being parsed."); d->disabledReason = tr("The .pro file '%1' is being parsed.")
.arg(QFileInfo(d->proFilePath).fileName());
return false; return false;
} }
if (!d->validParse) { if (!d->validParse) {
d->disabledReason = tr("The .pro file could not be parsed."); d->disabledReason = tr("The .pro file '%1' could not be parsed.")
.arg(QFileInfo(d->proFilePath).fileName());
return false; return false;
} }
if (!activeQt4BuildConfiguration()) { if (!activeQt4BuildConfiguration()) {
@@ -195,9 +197,10 @@ void RemoteLinuxRunConfiguration::proFileUpdate(Qt4ProjectManager::Qt4ProFileNod
{ {
if (d->proFilePath == pro->path()) { if (d->proFilePath == pro->path()) {
bool enabled = isEnabled(); bool enabled = isEnabled();
QString reason = disabledReason();
d->validParse = success; d->validParse = success;
d->parseInProgress = parseInProgress; d->parseInProgress = parseInProgress;
if (enabled != isEnabled()) if (enabled != isEnabled() || reason != disabledReason())
updateEnabledState(); updateEnabledState();
if (!parseInProgress) if (!parseInProgress)
emit targetInformationChanged(); emit targetInformationChanged();