Qt: Add features for Qt4 and Qt5

Change-Id: I3456c1b62f81c8137fb307b40903ce7b989ad21a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/plugins/qtsupport/baseqtversion.cpp

@@ -272,44 +272,49 @@ FeatureSet BaseQtVersion::availableFeatures() const
             | FeatureSet(Constants::FEATURE_QT_WEBKIT)
             | FeatureSet(Constants::FEATURE_QT_CONSOLE);
 
-     if (qtVersion() < QtVersionNumber(4, 7, 0))
-         return features;
+    if (qtVersion() < QtVersionNumber(5, 0, 0))
+        features |= FeatureSet(Constants::FEATURE_QT4);
+    else
+        features |= FeatureSet(Constants::FEATURE_QT5);
+
+    if (qtVersion() < QtVersionNumber(4, 7, 0))
+        return features;
 
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK);
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK_1);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK_1);
 
-     if (qtVersion() < QtVersionNumber(4, 7, 1))
-         return features;
+    if (qtVersion() < QtVersionNumber(4, 7, 1))
+        return features;
 
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK_1_1);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK_1_1);
 
-     if (qtVersion() < QtVersionNumber(5, 0, 0))
-         return features;
+    if (qtVersion() < QtVersionNumber(5, 0, 0))
+        return features;
 
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK_2);
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_0);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK_2);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_0);
 
-     if (qtVersion() < QtVersionNumber(5, 1, 0))
-         return features;
+    if (qtVersion() < QtVersionNumber(5, 1, 0))
+        return features;
 
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_1);
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS);
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1);
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1_0);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_1);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1_0);
 
-     if (qtVersion() < QtVersionNumber(5, 2, 0))
-         return features;
+    if (qtVersion() < QtVersionNumber(5, 2, 0))
+        return features;
 
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_2);
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1_1);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_2);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1_1);
 
-     if (qtVersion() < QtVersionNumber(5, 3, 0))
-         return features;
+    if (qtVersion() < QtVersionNumber(5, 3, 0))
+        return features;
 
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_3);
-     features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1_2);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_3);
+    features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1_2);
 
-     return features;
+    return features;
 }
 
 QString BaseQtVersion::platformName() const

src/plugins/qtsupport/qtsupportconstants.h

@@ -51,6 +51,8 @@ static const char QTVERSIONNAME[] = "Name";
 
 //Qt Features
 const char FEATURE_QT[] = "QtSupport.Wizards.FeatureQt";
+const char FEATURE_QT4[] = "QtSupport.Wizards.FeatureQt4";
+const char FEATURE_QT5[] = "QtSupport.Wizards.FeatureQt5";
 const char FEATURE_QWIDGETS[] = "QtSupport.Wizards.FeatureQWidgets";
 const char FEATURE_QT_QUICK[] = "QtSupport.Wizards.FeatureQtQuick";
 const char FEATURE_QMLPROJECT[] = "QtSupport.Wizards.FeatureQtQuickProject";