diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-11-27 14:02:44 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-12-02 14:49:25 +0000 |
| commit | d323d595b770e721ec69010b0a6bf9465b84e1ac (patch) | |
| tree | cc782772dac080c8d3d0143ead74678d1027fe70 /src/plugins/qtsupport/qtkitinformation.cpp | |
| parent | eebe44d3cfb62b94840b4845017bffb58ec601ae (diff) | |
QtVersion: Add a method to query the target device type
Add and implement a method to get the supported target device
types to the BaseQtVersion interface. Implement this for all
Qt versions.
Validate that the Qt version's target device type matches up
with the device type set in the kit and warn on mismatch.
Change-Id: I95da42031022663776afe23a50eae3677bdb1dda
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'src/plugins/qtsupport/qtkitinformation.cpp')
| -rw-r--r-- | src/plugins/qtsupport/qtkitinformation.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index 94aa930d159..b43a336e121 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -35,6 +35,9 @@ #include "qtversionmanager.h" #include "qtparser.h" +#include <projectexplorer/projectexplorerconstants.h> +#include <projectexplorer/task.h> + #include <utils/algorithm.h> #include <utils/buildablehelperlibrary.h> #include <utils/macroexpander.h> @@ -51,8 +54,8 @@ QtKitInformation::QtKitInformation() setId(QtKitInformation::id()); setPriority(26000); - connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitsLoaded()), - this, SLOT(kitsWereLoaded())); + connect(KitManager::instance(), &KitManager::kitsLoaded, + this, &QtKitInformation::kitsWereLoaded); } QVariant QtKitInformation::defaultValue(ProjectExplorer::Kit *k) const @@ -85,11 +88,11 @@ QVariant QtKitInformation::defaultValue(ProjectExplorer::Kit *k) const QList<ProjectExplorer::Task> QtKitInformation::validate(const ProjectExplorer::Kit *k) const { - QList<ProjectExplorer::Task> result; - QTC_ASSERT(QtVersionManager::isLoaded(), return result); + QTC_ASSERT(QtVersionManager::isLoaded(), return { }); BaseQtVersion *version = qtVersion(k); if (!version) - return result; + return { }; + return version->validateKit(k); } |