diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-01-05 15:49:50 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-01-06 14:29:23 +0000 |
| commit | cb501d482440931bb698a813095efa68a91962db (patch) | |
| tree | fd15557be1e808954da309777cfbfa4490dbe454 /src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp | |
| parent | 44539772a3c11e34e592b47a6b1aba701851023d (diff) | |
| download | qt-creator-cb501d482440931bb698a813095efa68a91962db.tar.gz | |
ProjectExplorer: Use FileName in WorkingDirectoryAspect
+ use native separators for user visible strings
Change-Id: Id6e4e27db369314f70e355a395cfddca12b8ea90
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index 6215b4189e..3523f31da1 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -316,7 +316,7 @@ void DesktopQmakeRunConfigurationWidget::effectiveTargetInformationChanged() m_ignoreChange = true; auto aspect = m_qmakeRunConfiguration->extraAspect<WorkingDirectoryAspect>(); - aspect->setDefaultWorkingDirectory(m_qmakeRunConfiguration->baseWorkingDirectory()); + aspect->setDefaultWorkingDirectory(FileName::fromString(m_qmakeRunConfiguration->baseWorkingDirectory())); aspect->pathChooser()->setBaseFileName(m_qmakeRunConfiguration->target()->project()->projectDirectory()); m_ignoreChange = false; } @@ -393,7 +393,7 @@ void DesktopQmakeRunConfiguration::setUsingLibrarySearchPath(bool state) QString DesktopQmakeRunConfiguration::workingDirectory() const { - return extraAspect<WorkingDirectoryAspect>()->workingDirectory(); + return extraAspect<WorkingDirectoryAspect>()->workingDirectory().toString(); } QString DesktopQmakeRunConfiguration::baseWorkingDirectory() const |