aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Teske <daniel.teske@digia.com>2012-12-14 13:18:59 +0100
committerTobias Hunger <tobias.hunger@digia.com>2012-12-17 13:51:59 +0100
commit2ebb4081fb8529f90bc8d3c84ca1d84d21bf2919 (patch)
tree50cc8ad80e1d9c595f665e03f6e4cc6dd626384f /src
parent3247ecf7581d1ab5b9f3fa97cf106df1fc91fe52 (diff)
CMake: Fix working directory of runconfigurations
On updating the working directory ensure that changes triggered from the cmakerunconfiguration are not interpreted as the user changing. Task-number: QTCREATORBUG-8426 Change-Id: Ibe6d026d864e1af48b01b5c81db9ad7c7fb6be2b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index a0601d8476d..df79da34314 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -414,8 +414,11 @@ void CMakeRunConfigurationWidget::setWorkingDirectory()
void CMakeRunConfigurationWidget::workingDirectoryChanged(const QString &workingDirectory)
{
- if (!m_ignoreChange)
+ if (!m_ignoreChange) {
+ m_ignoreChange = true;
m_workingDirectoryEdit->setPath(workingDirectory);
+ m_ignoreChange = false;
+ }
}
void CMakeRunConfigurationWidget::resetWorkingDirectory()