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

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

Browse Source 
Change-Id: I7a20eebadfda65aa68c1ff4f19c55b8a5e36559a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-09-03 17:09:29 +02:00
parent c3e7a9b830
commit 0d11208036
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,9 +241,11 @@ QString BaseQtVersion::defaultDisplayName(const QString &versionString, const Ut
location = QCoreApplication::translate("QtVersion", "System"); location = QCoreApplication::translate("QtVersion", "System");
break; break;
} }
if (dirName.compare(QLatin1String("bin"), Qt::CaseInsensitive)
&& dirName.compare(QLatin1String("qtbase"), Qt::CaseInsensitive)) {
location = dirName; location = dirName;
// Also skip default checkouts named 'qt'. Parent dir might have descriptive name.
if (dirName.compare(QLatin1String("bin"), Qt::CaseInsensitive)
&& dirName.compare(QLatin1String("qtbase"), Qt::CaseInsensitive)
&& dirName.compare(QLatin1String("qt"), Qt::CaseInsensitive)) {
break; break;
} }
} while (dir.cdUp()); } while (dir.cdUp());