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

ProjectExplorer: Use FileName in WorkingDirectoryAspect

Browse Source 
+ use native separators for user visible strings

Change-Id: Id6e4e27db369314f70e355a395cfddca12b8ea90
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-01-05 15:49:50 +02:00
committed by Orgad Shaneh
parent 44539772a3
commit cb501d4824
6 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
View File

@@ -248,7 +248,7 @@ QString QbsRunConfiguration::workingDirectory() const
{
const auto *wdAspect = extraAspect<WorkingDirectoryAspect>();
QTC_ASSERT(wdAspect, return baseWorkingDirectory());
return wdAspect->workingDirectory();
return wdAspect->workingDirectory().toString();
}
QString QbsRunConfiguration::baseWorkingDirectory() const
@@ -393,7 +393,7 @@ void QbsRunConfigurationWidget::targetInformationHasChanged()
setExecutableLineText(m_rc->executable());
WorkingDirectoryAspect *aspect = m_rc->extraAspect<WorkingDirectoryAspect>();
aspect->setDefaultWorkingDirectory(m_rc->baseWorkingDirectory());
aspect->setDefaultWorkingDirectory(Utils::FileName::fromString(m_rc->baseWorkingDirectory()));
aspect->pathChooser()->setBaseFileName(m_rc->target()->project()->projectDirectory());
m_ignoreChange = false;
}