From 2ffe1ac68f878011cad534cffe0e983b428f6f14 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@theqtcompany.com>
Date: Thu, 3 Sep 2015 15:24:20 +0200
Subject: [PATCH] BaseQtVersion: Use canonical filepath in a few places
I'm not sure whether this is better, but this fixes:
Change-Id: I2d7a606a59cdb25374cc75fed24ae14537eb3a55
Task-number: QTCREATORBUG-14968
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
---
src/plugins/qtsupport/baseqtversion.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index b4825cbf679..7197099153e 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1172,7 +1172,7 @@ bool BaseQtVersion::hasDemos() const
QString BaseQtVersion::demosPath() const
{
- return qmakeProperty("QT_INSTALL_DEMOS");
+ return QFileInfo(qmakeProperty("QT_INSTALL_DEMOS")).canonicalFilePath();
}
QString BaseQtVersion::frameworkInstallPath() const
@@ -1190,7 +1190,7 @@ bool BaseQtVersion::hasExamples() const
QString BaseQtVersion::examplesPath() const
{
- return qmakeProperty("QT_INSTALL_EXAMPLES");
+ return QFileInfo(qmakeProperty("QT_INSTALL_EXAMPLES")).canonicalFilePath();
}
QStringList BaseQtVersion::configValues() const
@@ -1525,7 +1525,7 @@ FileName BaseQtVersion::sourcePath(const QHash<QString, QString> &versionInfo)
{
const QString qt5Source = qmakeProperty(versionInfo, "QT_INSTALL_PREFIX/src");
if (!qt5Source.isEmpty())
- return Utils::FileName::fromString(qt5Source);
+ return Utils::FileName::fromString(QFileInfo(qt5Source).canonicalFilePath());
const QString installData = qmakeProperty(versionInfo, "QT_INSTALL_PREFIX");
QString sourcePath = installData;
@@ -1545,7 +1545,7 @@ FileName BaseQtVersion::sourcePath(const QHash<QString, QString> &versionInfo)
}
}
}
- return FileName::fromUserInput(sourcePath);
+ return FileName::fromUserInput(QFileInfo(sourcePath).canonicalFilePath());
}
bool BaseQtVersion::isInSourceDirectory(const Utils::FileName &filePath)
--
GitLab