From e05bb25306660b308c58244f41433e3c4a89c9ad Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 17 Jun 2021 16:16:24 +0200 Subject: [PATCH] Qmake: FilePathify QmakeBuildSystem::buildDir Change-Id: I856152c00a07d018b88526efb5576759e2b4b82f Reviewed-by: David Schulz --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 76b2d975a9a..a521d4bcf7a 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -789,11 +789,13 @@ FilePath QmakeBuildSystem::buildDir(const FilePath &proFilePath) const { const QDir srcDirRoot = QDir(projectDirectory().toString()); const QString relativeDir = srcDirRoot.relativeFilePath(proFilePath.parentDir().toString()); - const QString buildConfigBuildDir = buildConfiguration()->buildDirectory().toString(); - const QString buildDir = buildConfigBuildDir.isEmpty() - ? projectDirectory().toString() + const FilePath buildConfigBuildDir = buildConfiguration()->buildDirectory(); + FilePath buildDir = buildConfigBuildDir.isEmpty() + ? projectDirectory() : buildConfigBuildDir; - return FilePath::fromString(QDir::cleanPath(QDir(buildDir).absoluteFilePath(relativeDir))); + // FIXME: Convoluted. + buildDir.setPath(QDir::cleanPath(QDir(buildDir.path()).absoluteFilePath(relativeDir))); + return buildDir; } void QmakeBuildSystem::proFileParseError(const QString &errorMessage, const FilePath &filePath)