From 6b7c429c119fe4c0230bc824b79c69f18bad8ee8 Mon Sep 17 00:00:00 2001
From: jkobus <jaroslaw.kobus@digia.com>
Date: Thu, 13 Feb 2014 15:36:15 +0100
Subject: [PATCH] Make availableFeatures() nicer

Change-Id: Ia25c0967e6f65cb046c9f3b1798c747b8da02fc9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
 .../qtquick/qtquick_1_1/template.xml          |  2 +-
 .../qtquick/qtquick_2_1/template.xml          |  2 +-
 .../qtquick/qtquick_2_2/template.xml          |  2 +-
 .../qtquick/qtquickcontrols_1_0/template.xml  |  2 +-
 .../qtquick/qtquickcontrols_1_1/template.xml  |  2 +-
 src/plugins/qtsupport/baseqtversion.cpp       | 47 ++++++++++---------
 6 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/share/qtcreator/templates/qtquick/qtquick_1_1/template.xml b/share/qtcreator/templates/qtquick/qtquick_1_1/template.xml
index 43c7b37f4c9..96bb66cb34d 100644
--- a/share/qtcreator/templates/qtquick/qtquick_1_1/template.xml
+++ b/share/qtcreator/templates/qtquick/qtquick_1_1/template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template openeditor="main.qml" priority="E"
-    featuresRequired="QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.1.1"
+    featuresRequired="QtSupport.Wizards.FeatureQtQuick.1.1"
     viewerdir="qtquick1applicationviewer"
     viewerclassname="QtQuick1ApplicationViewer"
     stubversionminor="24">
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_1/template.xml b/share/qtcreator/templates/qtquick/qtquick_2_1/template.xml
index b8062947eb0..b87a4a871bd 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_1/template.xml
+++ b/share/qtcreator/templates/qtquick/qtquick_2_1/template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template openeditor="main.qml" priority="C"
-    featuresRequired="QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.2.1"
+    featuresRequired="QtSupport.Wizards.FeatureQtQuick.2.1"
     qrcdeployment="qrcdeployment.pri"
     stubversionminor="5">
     <displayname>Qt Quick 2.1</displayname>
diff --git a/share/qtcreator/templates/qtquick/qtquick_2_2/template.xml b/share/qtcreator/templates/qtquick/qtquick_2_2/template.xml
index de74f44440a..e6ad402e2fa 100644
--- a/share/qtcreator/templates/qtquick/qtquick_2_2/template.xml
+++ b/share/qtcreator/templates/qtquick/qtquick_2_2/template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template openeditor="main.qml" priority="A"
-    featuresRequired="QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.2.2"
+    featuresRequired="QtSupport.Wizards.FeatureQtQuick.2.2"
     qrcdeployment="qrcdeployment.pri"
     stubversionminor="5">
     <displayname>Qt Quick 2.2</displayname>
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml
index d91b90f6bb3..e9125626d12 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template openeditor="main.qml" priority="D"
-    featuresRequired="QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.Controls.1.0"
+    featuresRequired="QtSupport.Wizards.FeatureQtQuick.Controls.1.0"
     qrcdeployment="qrcdeployment.pri"
     stubversionminor="1">
     <displayname>Qt Quick Controls 1.0</displayname>
diff --git a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/template.xml b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/template.xml
index 83f6622c0c7..90bf708dbad 100644
--- a/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/template.xml
+++ b/share/qtcreator/templates/qtquick/qtquickcontrols_1_1/template.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <template openeditor="main.qml" priority="B"
-    featuresRequired="QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.Controls.1.1"
+    featuresRequired="QtSupport.Wizards.FeatureQtQuick.Controls.1.1"
     qrcdeployment="qrcdeployment.pri"
     stubversionminor="1">
     <displayname>Qt Quick Controls 1.1</displayname>
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 48c1f291918..7a405484357 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -230,31 +230,36 @@ FeatureSet BaseQtVersion::availableFeatures() const
             | FeatureSet(Constants::FEATURE_QT_WEBKIT)
             | FeatureSet(Constants::FEATURE_QT_CONSOLE);
 
-     if (qtVersion() >= QtVersionNumber(4, 7, 0)) {
-         features |= FeatureSet(Constants::FEATURE_QT_QUICK);
-         features |= FeatureSet(Constants::FEATURE_QT_QUICK_1);
-     }
+     if (qtVersion() < QtVersionNumber(4, 7, 0))
+         return features;
 
-     if (qtVersion() >= QtVersionNumber(4, 7, 1)) {
-         features |= FeatureSet(Constants::FEATURE_QT_QUICK_1_1);
-     }
+     features |= FeatureSet(Constants::FEATURE_QT_QUICK);
+     features |= FeatureSet(Constants::FEATURE_QT_QUICK_1);
 
-     if (qtVersion() >= QtVersionNumber(5, 0, 0)) {
-         features |= FeatureSet(Constants::FEATURE_QT_QUICK_2);
-         features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_0);
-     }
+     if (qtVersion() < QtVersionNumber(4, 7, 1))
+         return features;
 
-     if (qtVersion() >= QtVersionNumber(5, 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);
-     }
+     features |= FeatureSet(Constants::FEATURE_QT_QUICK_1_1);
 
-     if (qtVersion() >= QtVersionNumber(5, 2, 0)) {
-         features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_2);
-         features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1_1);
-     }
+     if (qtVersion() < QtVersionNumber(5, 0, 0))
+         return features;
+
+     features |= FeatureSet(Constants::FEATURE_QT_QUICK_2);
+     features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_0);
+
+     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);
+
+     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);
 
      return features;
 }