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

Qt Quick Application Wizards: Add Qt 5.6

Browse Source 
...also for qmake based projects

Change-Id: Ib8cab74a8b2249a13175593b27f228b4c7bc0052
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Alessandro Portale
2016-01-06 11:43:50 +01:00
parent b7eafe9512
commit 0118bc290a
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json
View File

@@ -43,6 +43,14 @@
"index": 2,
"items":
[
{
"trKey": "Qt 5.6",
"value":
"{
'qtQuickVersion': '2.6',
'qtQuickWindowVersion': '2.2'
}"
},
{
"trKey": "Qt 5.5",
"value":

10
share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json
View File

@@ -45,6 +45,16 @@
"index": 2,
"items":
[
{
"trKey": "Qt 5.6",
"value":
"{
'qtQuickVersion': '2.6',
'qtQuickControlsVersion': '1.5',
'qtQuickDialogsVersion': '1.2',
'qtQuickLayoutsVersion': '1.3'
}"
},
{
"trKey": "Qt 5.5",
"value":

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

@@ -429,6 +429,12 @@ FeatureSet BaseQtVersion::availableFeatures() const
if (qtVersion().matches(5, 5))
return features;
features |= FeatureSet::versionedFeatures(Constants::FEATURE_QT_QUICK_PREFIX, 2, 6);
features |= FeatureSet::versionedFeatures(Constants::FEATURE_QT_QUICK_CONTROLS_PREFIX, 1, 5);
if (qtVersion().matches(5, 6))
return features;
return features;
}