diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2018-09-13 13:48:36 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2018-09-13 13:38:09 +0000 |
| commit | 70fdbedbd8a8a4e00ef4e9ad282063115921a752 (patch) | |
| tree | c2f4b5bd786dc7062e9d2a0b138fd0809c6c3dd1 /src/plugins/qtsupport/baseqtversion.cpp | |
| parent | 4b852b4e04574e9d6780ff041163af2427c2a350 (diff) | |
Qml tooling: Support Qt 5.12
QtQuick 2.12
QtQuick.Controls 2.5
QtQuick.Window 2.12
QtQuick.VirtualKeyboard 2.4
Change-Id: Ie4a60ac93b25ca735e28ac84447cfe60778f8d7d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 398ba3bf13..ecd59ffbe1 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -332,6 +332,12 @@ QSet<Id> BaseQtVersion::availableFeatures() const if (qtVersion().matches(5, 11)) return features; + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_PREFIX, 2, 12)); + features.unite(versionedIds(Constants::FEATURE_QT_QUICK_CONTROLS_2_PREFIX, 2, 5)); + + if (qtVersion().matches(5, 12)) + return features; + return features; } |