Commit 0d112080 authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Use parent directory as name for Qt version if directory is 'qt'.



Change-Id: I7a20eebadfda65aa68c1ff4f19c55b8a5e36559a
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent c3e7a9b8
...@@ -241,9 +241,11 @@ QString BaseQtVersion::defaultDisplayName(const QString &versionString, const Ut ...@@ -241,9 +241,11 @@ QString BaseQtVersion::defaultDisplayName(const QString &versionString, const Ut
location = QCoreApplication::translate("QtVersion", "System"); location = QCoreApplication::translate("QtVersion", "System");
break; break;
} }
location = dirName;
// Also skip default checkouts named 'qt'. Parent dir might have descriptive name.
if (dirName.compare(QLatin1String("bin"), Qt::CaseInsensitive) if (dirName.compare(QLatin1String("bin"), Qt::CaseInsensitive)
&& dirName.compare(QLatin1String("qtbase"), Qt::CaseInsensitive)) { && dirName.compare(QLatin1String("qtbase"), Qt::CaseInsensitive)
location = dirName; && dirName.compare(QLatin1String("qt"), Qt::CaseInsensitive)) {
break; break;
} }
} while (dir.cdUp()); } while (dir.cdUp());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment