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

ProjectExplorer: Use better FilePath conversion function in builddir

Browse Source 
Change-Id: Id7c428390c15c410c3dc12eff18b1888174b1c64
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-01-24 17:58:58 +01:00
parent 7cb74e325f
commit f74cb26598
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/buildaspects.cpp
View File

@@ -92,7 +92,7 @@ void BuildDirectoryAspect::toMap(QVariantMap &map) const
StringAspect::toMap(map); StringAspect::toMap(map);
if (!d->sourceDir.isEmpty()) { if (!d->sourceDir.isEmpty()) {
const FilePath shadowDir = isChecked() ? filePath() : d->savedShadowBuildDir; const FilePath shadowDir = isChecked() ? filePath() : d->savedShadowBuildDir;
saveToMap(map, shadowDir.toString(), QString(), settingsKey() + ".shadowDir"); saveToMap(map, shadowDir.toSettings(), QString(), settingsKey() + ".shadowDir");
} }
} }
@@ -100,8 +100,7 @@ void BuildDirectoryAspect::fromMap(const QVariantMap &map)
{ {
StringAspect::fromMap(map); StringAspect::fromMap(map);
if (!d->sourceDir.isEmpty()) { if (!d->sourceDir.isEmpty()) {
d->savedShadowBuildDir = FilePath::fromString(map.value(settingsKey() + ".shadowDir") d->savedShadowBuildDir = FilePath::fromSettings(map.value(settingsKey() + ".shadowDir"));
.toString());
if (d->savedShadowBuildDir.isEmpty()) if (d->savedShadowBuildDir.isEmpty())
setFilePath(d->sourceDir); setFilePath(d->sourceDir);
setChecked(d->sourceDir != filePath()); setChecked(d->sourceDir != filePath());