feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make availableFeatures() nicer

Browse Source 
Change-Id: Ia25c0967e6f65cb046c9f3b1798c747b8da02fc9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
jkobus
2014-02-13 15:36:15 +01:00
committed by Jarek Kobus
parent 8e50ff5b7a
commit 6b7c429c11
6 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/templates/qtquick/qtquick_1_1/template.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<template openeditor="main.qml" priority="E" <template openeditor="main.qml" priority="E"
featuresRequired="QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.1.1" featuresRequired="QtSupport.Wizards.FeatureQtQuick.1.1"
viewerdir="qtquick1applicationviewer" viewerdir="qtquick1applicationviewer"
viewerclassname="QtQuick1ApplicationViewer" viewerclassname="QtQuick1ApplicationViewer"
stubversionminor="24"> stubversionminor="24">

2
share/qtcreator/templates/qtquick/qtquick_2_1/template.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<template openeditor="main.qml" priority="C" <template openeditor="main.qml" priority="C"
featuresRequired="QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.2.1" featuresRequired="QtSupport.Wizards.FeatureQtQuick.2.1"
qrcdeployment="qrcdeployment.pri" qrcdeployment="qrcdeployment.pri"
stubversionminor="5"> stubversionminor="5">
<displayname>Qt Quick 2.1</displayname> <displayname>Qt Quick 2.1</displayname>

2
share/qtcreator/templates/qtquick/qtquick_2_2/template.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<template openeditor="main.qml" priority="A" <template openeditor="main.qml" priority="A"
featuresRequired="QtSupport.Wizards.FeatureQtQuick, QtSupport.Wizards.FeatureQtQuick.2.2" featuresRequired="QtSupport.Wizards.FeatureQtQuick.2.2"
qrcdeployment="qrcdeployment.pri" qrcdeployment="qrcdeployment.pri"
stubversionminor="5"> stubversionminor="5">
<displayname>Qt Quick 2.2</displayname> <displayname>Qt Quick 2.2</displayname>

2
share/qtcreator/templates/qtquick/qtquickcontrols_1_0/template.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<template openeditor="main.qml" priority="D" <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" qrcdeployment="qrcdeployment.pri"
stubversionminor="1"> stubversionminor="1">
<displayname>Qt Quick Controls 1.0</displayname> <displayname>Qt Quick Controls 1.0</displayname>

2
share/qtcreator/templates/qtquick/qtquickcontrols_1_1/template.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<template openeditor="main.qml" priority="B" <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" qrcdeployment="qrcdeployment.pri"
stubversionminor="1"> stubversionminor="1">
<displayname>Qt Quick Controls 1.1</displayname> <displayname>Qt Quick Controls 1.1</displayname>

47
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -230,31 +230,36 @@ FeatureSet BaseQtVersion::availableFeatures() const
| FeatureSet(Constants::FEATURE_QT_WEBKIT) | FeatureSet(Constants::FEATURE_QT_WEBKIT)
| FeatureSet(Constants::FEATURE_QT_CONSOLE); | FeatureSet(Constants::FEATURE_QT_CONSOLE);
if (qtVersion() >= QtVersionNumber(4, 7, 0)) { if (qtVersion() < QtVersionNumber(4, 7, 0))
features |= FeatureSet(Constants::FEATURE_QT_QUICK); return features;
features |= FeatureSet(Constants::FEATURE_QT_QUICK_1);
}
if (qtVersion() >= QtVersionNumber(4, 7, 1)) { features |= FeatureSet(Constants::FEATURE_QT_QUICK);
features |= FeatureSet(Constants::FEATURE_QT_QUICK_1_1); features |= FeatureSet(Constants::FEATURE_QT_QUICK_1);
}
if (qtVersion() >= QtVersionNumber(5, 0, 0)) { if (qtVersion() < QtVersionNumber(4, 7, 1))
features |= FeatureSet(Constants::FEATURE_QT_QUICK_2); return features;
features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_0);
}
if (qtVersion() >= QtVersionNumber(5, 1, 0)) { features |= FeatureSet(Constants::FEATURE_QT_QUICK_1_1);
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)) { if (qtVersion() < QtVersionNumber(5, 0, 0))
features |= FeatureSet(Constants::FEATURE_QT_QUICK_2_2); return features;
features |= FeatureSet(Constants::FEATURE_QT_QUICK_CONTROLS_1_1);
} 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; return features;
} }