diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-04-18 09:22:19 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-04-18 09:22:19 +0200 |
| commit | 44931c098583ee5365ec7e3de716c0c6a74b8372 (patch) | |
| tree | c2944dc59e6c1c679de1bfbb2880b4e129317b6c /src/plugins/qtsupport/baseqtversion.cpp | |
| parent | ea75b0d18312cd1eb8caf139413dc2a064f1d788 (diff) | |
| parent | 1526011f32ae5becdedcf4ee55e32bbcf5724bcb (diff) | |
| download | qt-creator-44931c098583ee5365ec7e3de716c0c6a74b8372.tar.gz | |
Merge remote-tracking branch 'origin/2.7'
Conflicts:
src/plugins/pythoneditor/tools/lexical/pythonformattoken.h
Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
Diffstat (limited to 'src/plugins/qtsupport/baseqtversion.cpp')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 531389dba9..579507fea7 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -266,6 +266,8 @@ Core::FeatureSet BaseQtVersion::availableFeatures() const features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_1_1); if (qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0)) features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_2); + if (qtVersion() >= QtSupport::QtVersionNumber(5, 1, 0)) + features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS); return features; } |