diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2014-11-20 15:41:55 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2014-11-20 16:16:43 +0100 |
| commit | 682dd3d5ced9e2d3709e88a770dc52145be3e881 (patch) | |
| tree | a8b647e6309f46258dad2a24d237ea5637fb15f9 /src/plugins | |
| parent | 4fefe0c202be407ec23125e12052b8039b03828c (diff) | |
| download | qt-creator-682dd3d5ced9e2d3709e88a770dc52145be3e881.tar.gz | |
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>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qtsupport/qtkitinformation.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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; } |