From 0d1120803602f6ac1120eef55b7c1971df8d1b4f Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Mon, 3 Sep 2012 17:09:29 +0200
Subject: [PATCH] Use parent directory as name for Qt version if directory is
 'qt'.

Change-Id: I7a20eebadfda65aa68c1ff4f19c55b8a5e36559a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
---
 src/plugins/qtsupport/baseqtversion.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 957e6936486..7d01ab44c0c 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -241,9 +241,11 @@ QString BaseQtVersion::defaultDisplayName(const QString &versionString, const Ut
                 location = QCoreApplication::translate("QtVersion", "System");
                 break;
             }
+            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)) {
-                location = dirName;
+                && dirName.compare(QLatin1String("qtbase"), Qt::CaseInsensitive)
+                && dirName.compare(QLatin1String("qt"), Qt::CaseInsensitive)) {
                 break;
             }
         } while (dir.cdUp());