From 682dd3d5ced9e2d3709e88a770dc52145be3e881 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Thu, 20 Nov 2014 15:41:55 +0100
Subject: QtKitInformation: Report correct version Id

We try hard to find the correct version, but then forget to report
that back before continuing to find a weaker match.

Change-Id: I824194fe4d13db04eba488268165b27c033d33bf
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
---
 src/plugins/qtsupport/qtkitinformation.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/plugins')

diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp
index 386f8e2ea7..969cb92a03 100644
--- a/src/plugins/qtsupport/qtkitinformation.cpp
+++ b/src/plugins/qtsupport/qtkitinformation.cpp
@@ -77,13 +77,14 @@ QVariant QtKitInformation::defaultValue(ProjectExplorer::Kit *k) const
         result = findOrDefault(versionList, [qmakePath](const BaseQtVersion *v) {
             return v->qmakeCommand() == qmakePath;
         });
+        if (result)
+            return result->uniqueId();
     }
 
     // Use *any* desktop Qt:
     result = findOrDefault(versionList, [](const BaseQtVersion *v) {
         return v->type() == QLatin1String(QtSupport::Constants::DESKTOPQT);
     });
-
     return result ? result->uniqueId() : -1;
 }
 
-- 
cgit v1.2.1