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

QtSupport: Use FilePath api to detect Qt special names

Browse Source 
Change-Id: I1b95c049a63cdbb69c873e675d6e93722b1c422e
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2021-09-09 06:59:26 +02:00
parent 686603ae83
commit 66a7f8d527
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -351,9 +351,8 @@ QString BaseQtVersion::defaultUnexpandedDisplayName() const
} else { } else {
// Deduce a description from '/foo/qt-folder/[qtbase]/bin/qmake' -> '/foo/qt-folder'. // Deduce a description from '/foo/qt-folder/[qtbase]/bin/qmake' -> '/foo/qt-folder'.
// '/usr' indicates System Qt 4.X on Linux. // '/usr' indicates System Qt 4.X on Linux.
QDir dir = qmakeFilePath().toFileInfo().absoluteDir(); for (FilePath dir = qmakeFilePath().parentDir(); !dir.isEmpty(); dir = dir.parentDir()) {
do { const QString dirName = dir.fileName();
const QString dirName = dir.dirName();
if (dirName == "usr") { // System-installed Qt. if (dirName == "usr") { // System-installed Qt.
location = QCoreApplication::translate("QtVersion", "System"); location = QCoreApplication::translate("QtVersion", "System");
break; break;
@@ -365,7 +364,7 @@ QString BaseQtVersion::defaultUnexpandedDisplayName() const
&& dirName.compare("qt", Qt::CaseInsensitive)) { && dirName.compare("qt", Qt::CaseInsensitive)) {
break; break;
} }
} while (!dir.isRoot() && dir.cdUp()); }
} }
return detectionSource() == "PATH" ? return detectionSource() == "PATH" ?