diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-06-16 14:52:24 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-06-17 11:29:39 +0000 |
| commit | e509441e4f8e5878cffda0b0c3205aefae411bb5 (patch) | |
| tree | 5b6c945187cf81bb06d2423dfe43fdf185de0500 /share | |
| parent | 0c2b1287c454e582b8e2fc55f0e2e5aabb03f0b0 (diff) | |
| download | qt-creator-e509441e4f8e5878cffda0b0c3205aefae411bb5.tar.gz | |
JsonWizards: Only show wizards with Qt versions that support them
Task-number: QTCREATORBUG-14216
Change-Id: I7e9e760f7ba9ef6022e76f1600e473a5f54c9893
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json | 11 | ||||
| -rw-r--r-- | share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json | 11 |
2 files changed, 14 insertions, 8 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json index a62a8b43ef..6e14d9b695 100644 --- a/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickapplication/wizard.json @@ -8,7 +8,7 @@ "trDisplayCategory": "Application", "icon": "qml_wizard.png", "featuresRequired": [ "QtSupport.Wizards.FeatureQt", "QtSupport.Wizards.FeatureQtQuick.2" ], - "enabled": "${JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}", + "enabled": "${JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 && [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.3') >= 0}", "options": [ @@ -45,7 +45,8 @@ "{ 'qtQuickVersion': '2.5', 'qtQuickWindowVersion': '2.2' - }" + }", + "condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.5') >= 0}" }, { "trKey": "Qt 5.4", @@ -53,7 +54,8 @@ "{ 'qtQuickVersion': '2.4', 'qtQuickWindowVersion': '2.2' - }" + }", + "condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.4') >= 0}" }, { "trKey": "Qt 5.3", @@ -61,7 +63,8 @@ "{ 'qtQuickVersion': '2.3', 'qtQuickWindowVersion': '2.2' - }" + }", + "condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.3') >= 0}" } ] } diff --git a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json index a0297b1e69..13567e55f1 100644 --- a/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json +++ b/share/qtcreator/templates/wizards/projects/qmake/qtquickcontrolsapplication/wizard.json @@ -8,7 +8,7 @@ "trDisplayCategory": "Application", "icon": "../qtquickapplication/qml_wizard.png", "featuresRequired": [ "QtSupport.Wizards.FeatureQt" ], - "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}", + "enabled": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 && [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.3') >= 0 }", "options": [ @@ -49,7 +49,8 @@ 'qtQuickControlsVersion': '1.3', 'qtQuickDialogsVersion': '1.2', 'qtQuickLayoutsVersion': '1.2' - }" + }", + "condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.5') >= 0}" }, { "trKey": "Qt 5.4", @@ -59,7 +60,8 @@ 'qtQuickControlsVersion': '1.2', 'qtQuickDialogsVersion': '1.2', 'qtQuickLayoutsVersion': '1.1' - }" + }", + "condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.4') >= 0}" }, { "trKey": "Qt 5.3", @@ -69,7 +71,8 @@ 'qtQuickControlsVersion': '1.2', 'qtQuickDialogsVersion': '1.2', 'qtQuickLayoutsVersion': '1.1' - }" + }", + "condition": "%{JS: [ %{Features} ].indexOf('QtSupport.Wizards.FeatureQt5.3') >= 0}" } ] } |