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

Use PathChooser::rawPath() where it makes sense

Browse Source
This commit is contained in:
Tobias Hunger
2010-09-24 12:39:25 +02:00
parent 50f9165b05
commit 37c641e668
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -435,7 +435,7 @@ void CMakeRunConfigurationWidget::setWorkingDirectory()
if (m_ignoreChange) if (m_ignoreChange)
return; return;
m_ignoreChange = true; m_ignoreChange = true;
m_cmakeRunConfiguration->setUserWorkingDirectory(m_workingDirectoryEdit->path()); m_cmakeRunConfiguration->setUserWorkingDirectory(m_workingDirectoryEdit->rawPath());
m_ignoreChange = false; m_ignoreChange = false;
} }
@@ -449,7 +449,7 @@ void CMakeRunConfigurationWidget::resetWorkingDirectory()
{ {
// This emits a signal connected to workingDirectoryChanged() // This emits a signal connected to workingDirectoryChanged()
// that sets the m_workingDirectoryEdit // that sets the m_workingDirectoryEdit
m_cmakeRunConfiguration->setUserWorkingDirectory(""); m_cmakeRunConfiguration->setUserWorkingDirectory(QString());
} }
void CMakeRunConfigurationWidget::useCppDebuggerToggled(bool toggled) void CMakeRunConfigurationWidget::useCppDebuggerToggled(bool toggled)

2
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -514,7 +514,7 @@ void GenericBuildSettingsWidget::init(BuildConfiguration *bc)
void GenericBuildSettingsWidget::buildDirectoryChanged() void GenericBuildSettingsWidget::buildDirectoryChanged()
{ {
m_buildConfiguration->setBuildDirectory(m_pathChooser->path()); m_buildConfiguration->setBuildDirectory(m_pathChooser->rawPath());
} }
void GenericBuildSettingsWidget::toolChainSelected(int index) void GenericBuildSettingsWidget::toolChainSelected(int index)

3
src/plugins/qt4projectmanager/qt4runconfiguration.cpp
View File

@@ -209,6 +209,7 @@ Qt4RunConfigurationWidget::Qt4RunConfigurationWidget(Qt4RunConfiguration *qt4Run
m_workingDirectoryEdit->setPath(m_qt4RunConfiguration->workingDirectory()); m_workingDirectoryEdit->setPath(m_qt4RunConfiguration->workingDirectory());
m_workingDirectoryEdit->setBaseDirectory(m_qt4RunConfiguration->target()->project()->projectDirectory()); m_workingDirectoryEdit->setBaseDirectory(m_qt4RunConfiguration->target()->project()->projectDirectory());
m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory); m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory);
m_workingDirectoryEdit->setEnvironment(m_qt4RunConfiguration->environment());
m_workingDirectoryEdit->setPromptDialogTitle(tr("Select Working Directory")); m_workingDirectoryEdit->setPromptDialogTitle(tr("Select Working Directory"));
QToolButton *resetButton = new QToolButton(this); QToolButton *resetButton = new QToolButton(this);
@@ -378,7 +379,7 @@ void Qt4RunConfigurationWidget::workDirectoryEdited()
if (m_ignoreChange) if (m_ignoreChange)
return; return;
m_ignoreChange = true; m_ignoreChange = true;
m_qt4RunConfiguration->setWorkingDirectory(m_workingDirectoryEdit->path()); m_qt4RunConfiguration->setWorkingDirectory(m_workingDirectoryEdit->rawPath());
m_ignoreChange = false; m_ignoreChange = false;
} }