aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qtsupport/baseqtversion.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2017-01-12 10:44:57 +0100
committerTobias Hunger <tobias.hunger@qt.io>2017-01-18 10:40:18 +0000
commit4133404f2bd5f599a5db232925caf700acbd9d3d (patch)
tree3e730783c8fddb122981faeb18060116a7c4232b /src/plugins/qtsupport/baseqtversion.cpp
parent96c6033d39f126d98aeeb137980bfeb751eeb867 (diff)
QtVersionManager: Remove validVersions(...)
Remove validVersions(...). Use versions(...) instead in conjunction with BaseQtVersion::isValidMatcher. Change-Id: I036bdafccc8b9ee5708baca81f853ea48ca7e737 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
-rw-r--r--src/plugins/qtsupport/baseqtversion.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index acb9f48326..7cb6a4f944 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -647,6 +647,13 @@ bool BaseQtVersion::isValid() const
&& m_qmakeIsExecutable;
}
+BaseQtVersion::Predicate BaseQtVersion::isValidPredicate(const BaseQtVersion::Predicate &predicate)
+{
+ if (predicate)
+ return [predicate](const BaseQtVersion *v) { return v->isValid() && predicate(v); };
+ return [](const BaseQtVersion *v) { return v->isValid(); };
+}
+
QString BaseQtVersion::invalidReason() const
{
if (displayName().isEmpty())