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

Cmake: Fix problems with QString / Utils::FileName conversions

Browse Source 
Change-Id: I47acade7b240b622ef7e49155700c1240f7ce70c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Ulf Hermann
2016-01-06 16:44:32 +01:00
parent cb501d4824
commit 419b2951fd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,7 +76,7 @@ CMakeRunConfiguration::CMakeRunConfiguration(Target *parent, Core::Id id, const
addExtraAspect(new TerminalAspect(this, QStringLiteral("CMakeProjectManager.CMakeRunConfiguration.UseTerminal"))); addExtraAspect(new TerminalAspect(this, QStringLiteral("CMakeProjectManager.CMakeRunConfiguration.UseTerminal")));
auto wd = new WorkingDirectoryAspect(this, QStringLiteral("CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory")); auto wd = new WorkingDirectoryAspect(this, QStringLiteral("CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"));
wd->setDefaultWorkingDirectory(workingDirectory); wd->setDefaultWorkingDirectory(Utils::FileName::fromString(workingDirectory));
addExtraAspect(wd); addExtraAspect(wd);
ctor(); ctor();
@@ -110,7 +110,7 @@ QString CMakeRunConfiguration::workingDirectory() const
{ {
const auto *wdAspect = extraAspect<WorkingDirectoryAspect>(); const auto *wdAspect = extraAspect<WorkingDirectoryAspect>();
QTC_ASSERT(wdAspect, return baseWorkingDirectory()); QTC_ASSERT(wdAspect, return baseWorkingDirectory());
return wdAspect->workingDirectory(); return wdAspect->workingDirectory().toString();
} }
QString CMakeRunConfiguration::baseWorkingDirectory() const QString CMakeRunConfiguration::baseWorkingDirectory() const
@@ -138,7 +138,8 @@ void CMakeRunConfiguration::setExecutable(const QString &executable)
void CMakeRunConfiguration::setBaseWorkingDirectory(const QString &wd) void CMakeRunConfiguration::setBaseWorkingDirectory(const QString &wd)
{ {
extraAspect<WorkingDirectoryAspect>()->setDefaultWorkingDirectory(wd); extraAspect<WorkingDirectoryAspect>()
->setDefaultWorkingDirectory(Utils::FileName::fromString(wd));
} }
QVariantMap CMakeRunConfiguration::toMap() const QVariantMap CMakeRunConfiguration::toMap() const