diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/qtsupport/qtsupportconstants.h | 1 | ||||
| -rw-r--r-- | src/tools/icons/qtcreatoricons.svg | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 8a53934c83..9dad77df0d 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -419,6 +419,11 @@ QSet<Id> QtVersion::availableFeatures() const features.unite(versionedIds(Constants::FEATURE_QT_QUICK_PREFIX, 6, -1)); features.unite(versionedIds(Constants::FEATURE_QT_QUICK_CONTROLS_2_PREFIX, 6, -1)); + if (QVersionNumber(6, 1).isPrefixOf(qtVersion())) + return features; + + features.insert(Constants::FEATURE_QT_QML_CMAKE_API); + return features; } diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index 1beacf4b1e..66a7c8978c 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -29,6 +29,7 @@ const char FEATURE_QT_QUICK_UI_FILES[] = "QtSupport.Wizards.FeatureQtQuick.UiFil const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit"; const char FEATURE_QT_3D[] = "QtSupport.Wizards.FeatureQt3d"; const char FEATURE_QT_CANVAS3D_PREFIX[] = "QtSupport.Wizards.FeatureQtCanvas3d"; +const char FEATURE_QT_QML_CMAKE_API[] = "QtSupport.Wizards.FeatureQtQmlCMakeApi"; const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole"; const char FEATURE_MOBILE[] = "QtSupport.Wizards.FeatureMobile"; const char FEATURE_DESKTOP[] = "QtSupport.Wizards.FeatureDesktop"; diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg index 9cf158938b..8e6a6baa2d 100644 --- a/src/tools/icons/qtcreatoricons.svg +++ b/src/tools/icons/qtcreatoricons.svg @@ -2181,7 +2181,7 @@ inkscape:connector-curvature="0" /> </g> <g - id="share/qtcreator/templates/wizards/projects/qtquickapplication/empty/icon" + id="share/qtcreator/templates/wizards/projects/qtquickapplication/icon" transform="translate(-23,-82)"> <use style="display:inline" |
