From 37c641e668c9f3cd83108e4a5f2e4d6f35e45b54 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Fri, 24 Sep 2010 12:39:25 +0200
Subject: [PATCH] Use PathChooser::rawPath() where it makes sense
---
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp | 4 ++--
src/plugins/genericprojectmanager/genericproject.cpp | 2 +-
src/plugins/qt4projectmanager/qt4runconfiguration.cpp | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index 33602ccc748..acf0102d65f 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -435,7 +435,7 @@ void CMakeRunConfigurationWidget::setWorkingDirectory()
if (m_ignoreChange)
return;
m_ignoreChange = true;
- m_cmakeRunConfiguration->setUserWorkingDirectory(m_workingDirectoryEdit->path());
+ m_cmakeRunConfiguration->setUserWorkingDirectory(m_workingDirectoryEdit->rawPath());
m_ignoreChange = false;
}
@@ -449,7 +449,7 @@ void CMakeRunConfigurationWidget::resetWorkingDirectory()
{
// This emits a signal connected to workingDirectoryChanged()
// that sets the m_workingDirectoryEdit
- m_cmakeRunConfiguration->setUserWorkingDirectory("");
+ m_cmakeRunConfiguration->setUserWorkingDirectory(QString());
}
void CMakeRunConfigurationWidget::useCppDebuggerToggled(bool toggled)
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 0f85ca928fd..db8db8c5cf8 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -514,7 +514,7 @@ void GenericBuildSettingsWidget::init(BuildConfiguration *bc)
void GenericBuildSettingsWidget::buildDirectoryChanged()
{
- m_buildConfiguration->setBuildDirectory(m_pathChooser->path());
+ m_buildConfiguration->setBuildDirectory(m_pathChooser->rawPath());
}
void GenericBuildSettingsWidget::toolChainSelected(int index)
diff --git a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
index 1ab6c4c0412..b5fe3731ea8 100644
--- a/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4runconfiguration.cpp
@@ -209,6 +209,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
m_workingDirectoryEdit->setPath(m_qt4RunConfiguration->workingDirectory());
m_workingDirectoryEdit->setBaseDirectory(m_qt4RunConfiguration->target()->project()->projectDirectory());
m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory);
+ m_workingDirectoryEdit->setEnvironment(m_qt4RunConfiguration->environment());
m_workingDirectoryEdit->setPromptDialogTitle(tr("Select Working Directory"));
QToolButton *resetButton = new QToolButton(this);
@@ -378,7 +379,7 @@ void Qt4RunConfigurationWidget::workDirectoryEdited()
if (m_ignoreChange)
return;
m_ignoreChange = true;
- m_qt4RunConfiguration->setWorkingDirectory(m_workingDirectoryEdit->path());
+ m_qt4RunConfiguration->setWorkingDirectory(m_workingDirectoryEdit->rawPath());
m_ignoreChange = false;
}
--
GitLab