aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
diff options
context:
space:
mode:
authorhjk <[email protected]>2025-01-09 11:58:40 +0100
committerhjk <[email protected]>2025-01-10 13:05:29 +0000
commit2d9d6aa315976dc8937381e453f57263950d8841 (patch)
tree7ccb860763e95ad24272b158ead690afb79e9c3b /src/plugins/qmakeprojectmanager/qmakemakestep.cpp
parent0986822d44c80ee1fc8fef0289a05ccc2d4d3668 (diff)
Utils: Rename FilePath::toString() into toUrlishString()
toString() is almost always the wrong conversion, but unfortunately too easy to find and often even working at least for local setup. This here raises the bar as the non-availability of the "obvious" toString() hopefully helps people to think about the semantics of the needed conversion and choose the right toXXX() function. The chosen new name is intentional ugly to reduce the likelihood that this (still almost always wrong) function is used out of convenience. Change-Id: I57f1618dd95ef2629d7d978688d130275e096c0f Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakemakestep.cpp')
-rw-r--r--src/plugins/qmakeprojectmanager/qmakemakestep.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
index 1f5a292467a..70b21ebccc8 100644
--- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp
@@ -128,7 +128,7 @@ bool QmakeMakeStep::init()
if (bc->fileNodeBuild() && subProFile) {
QString objectsDir = subProFile->objectsDirectory();
if (objectsDir.isEmpty()) {
- objectsDir = bc->qmakeBuildSystem()->buildDir(subProFile->filePath()).toString();
+ objectsDir = bc->qmakeBuildSystem()->buildDir(subProFile->filePath()).toUrlishString();
if (subProFile->isDebugAndRelease()) {
if (bc->buildType() == QmakeBuildConfiguration::Debug)
objectsDir += "/debug";
@@ -142,11 +142,11 @@ bool QmakeMakeStep::init()
const FilePath proFileDir = subProFile->proFile()->sourceDir().canonicalPath();
if (!objectsDir.endsWith('/'))
objectsDir += QLatin1Char('/');
- objectsDir += sourceFileDir.relativeChildPath(proFileDir).toString();
+ objectsDir += sourceFileDir.relativeChildPath(proFileDir).toUrlishString();
objectsDir = QDir::cleanPath(objectsDir);
}
- QString relObjectsDir = QDir(pp->workingDirectory().toString())
+ QString relObjectsDir = QDir(pp->workingDirectory().toUrlishString())
.relativeFilePath(objectsDir);
if (relObjectsDir == ".")
relObjectsDir.clear();