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

Qmake: FilePathify QmakeBuildSystem::buildDir

Browse Source 
Change-Id: I856152c00a07d018b88526efb5576759e2b4b82f
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2021-06-17 16:16:24 +02:00
parent 41dafc8132
commit e05bb25306
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/qmakeproject.cpp
View File

@@ -789,11 +789,13 @@ FilePath QmakeBuildSystem::buildDir(const FilePath &proFilePath) const
{ {
const QDir srcDirRoot = QDir(projectDirectory().toString()); const QDir srcDirRoot = QDir(projectDirectory().toString());
const QString relativeDir = srcDirRoot.relativeFilePath(proFilePath.parentDir().toString()); const QString relativeDir = srcDirRoot.relativeFilePath(proFilePath.parentDir().toString());
const QString buildConfigBuildDir = buildConfiguration()->buildDirectory().toString(); const FilePath buildConfigBuildDir = buildConfiguration()->buildDirectory();
const QString buildDir = buildConfigBuildDir.isEmpty() FilePath buildDir = buildConfigBuildDir.isEmpty()
? projectDirectory().toString() ? projectDirectory()
: buildConfigBuildDir; : 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) void QmakeBuildSystem::proFileParseError(const QString &errorMessage, const FilePath &filePath)