diff options
| -rw-r--r-- | src/lib/corelib/tools/setupprojectparameters.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/corelib/tools/setupprojectparameters.cpp b/src/lib/corelib/tools/setupprojectparameters.cpp index 30499fe41..79712ae5f 100644 --- a/src/lib/corelib/tools/setupprojectparameters.cpp +++ b/src/lib/corelib/tools/setupprojectparameters.cpp @@ -36,6 +36,8 @@ #include <tools/scripttools.h> #include <tools/settings.h> +#include <QFileInfo> + namespace qbs { namespace Internal { @@ -151,6 +153,10 @@ QString SetupProjectParameters::projectFilePath() const void SetupProjectParameters::setProjectFilePath(const QString &projectFilePath) { d->projectFilePath = projectFilePath; + + const QString canonicalProjectFilePath = QFileInfo(d->projectFilePath).canonicalFilePath(); + if (!canonicalProjectFilePath.isEmpty()) + d->projectFilePath = projectFilePath; } /*! @@ -173,6 +179,10 @@ QString SetupProjectParameters::buildRoot() const void SetupProjectParameters::setBuildRoot(const QString &buildRoot) { d->buildRoot = buildRoot; + + const QString canonicalBuildRoot = QFileInfo(d->buildRoot).canonicalFilePath(); + if (!canonicalBuildRoot.isEmpty()) + d->buildRoot = canonicalBuildRoot; } /*! |