diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index de449dc8df437f7905184b28a3fa291b3fa3cbe6..5c894f14a9872a68dbc1744fe51638d4a8e36338 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -261,8 +261,16 @@ Core::FeatureSet BaseQtVersion::availableFeatures() const | Core::FeatureSet(QtSupport::Constants::FEATURE_QT_WEBKIT) | Core::FeatureSet(QtSupport::Constants::FEATURE_QT_CONSOLE); - if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0)) + if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 0)) { features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK); + features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_1); + } + if (qtVersion() >= QtSupport::QtVersionNumber(4, 7, 1)) { + 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); + } return features; } diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index bc2debe058e3d85c35ef0343bf966d8c0397b612..0db8ce8e4613da89b7fbc89a420f3b8f066128b2 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -51,6 +51,9 @@ const char WINCEQT[] = "Qt4ProjectManager.QtVersion.WinCE"; const char FEATURE_QT[] = "QtSupport.Wizards.FeatureQt"; const char FEATURE_QWIDGETS[] = "QtSupport.Wizards.FeatureQWidgets"; const char FEATURE_QT_QUICK[] = "QtSupport.Wizards.FeatureQtQuick"; +const char FEATURE_QT_QUICK_1[] = "QtSupport.Wizards.FeatureQtQuick.1"; +const char FEATURE_QT_QUICK_1_1[] = "QtSupport.Wizards.FeatureQtQuick.1.1"; +const char FEATURE_QT_QUICK_2[] = "QtSupport.Wizards.FeatureQtQuick.2"; const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit"; const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole"; const char FEATURE_GENERIC_CPP_ENTRY_POINT[] ="QtSupport.Wizards.FeatureGenericCppEntryPoint";