Export Wizard values to JavaScript macro (Fixes)

This fixes a few misses from e0d38ae414 Change-Id: Ibd0253ca4045afe3745cafeca2f57b083e141bd3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-05-10 22:14:18 +12:00
parent cf6421d3d1
commit 71751bb2fc
11 changed files with 14 additions and 14 deletions
--- a/share/qtcreator/templates/wizards/projects/plaincpp/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/plaincpp/wizard.json
@@ -7,7 +7,7 @@
    "trDisplayName": "Plain C++ Application",
    "trDisplayCategory": "Non-Qt Project",
    "icon": "../../global/consoleapplication.png",
-    "enabled": "%{JS: [ %{Plugins} ].indexOf('CppEditor') >= 0 && ([ %{Plugins} ].indexOf('QmakeProjectManager') >= 0 || [ %{Plugins} ].indexOf('QbsProjectManager') >= 0 || [ %{Plugins} ].indexOf('CMakeProjectManager') >= 0)}",
+    "enabled": "%{JS: value('Plugins').indexOf('CppEditor') >= 0 && (value('Plugins').indexOf('QmakeProjectManager') >= 0 || value('Plugins').indexOf('QbsProjectManager') >= 0 || value('Plugins').indexOf('CMakeProjectManager') >= 0)}",

    "options":
    [
@@ -44,17 +44,17 @@
                            {
                                "trKey": "qmake",
                                "value": "qmake",
-                                "condition": "%{JS: [ %{Plugins} ].indexOf('QmakeProjectManager') >= 0}"
+                                "condition": "%{JS: value('Plugins').indexOf('QmakeProjectManager') >= 0}"
                            },
                            {
                                "trKey": "CMake",
                                "value": "cmake",
-                                "condition": "%{JS: [ %{Plugins} ].indexOf('CMakeProjectManager') >= 0}"
+                                "condition": "%{JS: value('Plugins).indexOf('CMakeProjectManager') >= 0}"
                            },
                            {
                                "trKey": "Qbs",
                                "value": "qbs",
-                                "condition": "%{JS: [ %{Plugins} ].indexOf('QbsProjectManager') >= 0}"
+                                "condition": "%{JS: value('Plugins').indexOf('QbsProjectManager') >= 0}"
                            }
                        ]
                    }
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/empty/wizard.json
@@ -164,7 +164,7 @@
                    "type": "CheckBox",
                    "data":
                    {
-                        "checked": "%{JS: %{UseVirtualKeyboardByDefault}}"
+                        "checked": "%{UseVirtualKeyboardByDefault}"
                    }
                }
            ]
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/scroll/wizard.json
@@ -215,7 +215,7 @@
                    "type": "CheckBox",
                    "data":
                    {
-                        "checked": "%{JS: %{UseVirtualKeyboardByDefault}}"
+                        "checked": "%{UseVirtualKeyboardByDefault}"
                    }
                }
            ]
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/stack/wizard.json
@@ -233,7 +233,7 @@
                    "type": "CheckBox",
                    "data":
                    {
-                        "checked": "%{JS: %{UseVirtualKeyboardByDefault}}"
+                        "checked": "%{UseVirtualKeyboardByDefault}"
                    }
                }
            ]
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/swipe/wizard.json
@@ -233,7 +233,7 @@
                    "type": "CheckBox",
                    "data":
                    {
-                        "checked": "%{JS: %{UseVirtualKeyboardByDefault}}"
+                        "checked": "%{UseVirtualKeyboardByDefault}"
                    }
                }
            ]
--- a/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickuiprototype/wizard.json
@@ -124,7 +124,7 @@
                    "type": "CheckBox",
                    "data":
                    {
-                        "checked": "%{JS: %{UseVirtualKeyboardByDefault}}"
+                        "checked": "%{UseVirtualKeyboardByDefault}"
                    }
                }
            ]
--- a/share/qtcreator/templates/wizards/projects/vcs/bazaar/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/vcs/bazaar/wizard.json
@@ -7,7 +7,7 @@
    "trDisplayName": "Bazaar Clone (Or Branch)",
    "trDisplayCategory": "Import Project",
    "icon": "icon.png",
-    "enabled": "%{JS: [ %{Plugins} ].indexOf('Bazaar') >= 0}",
+    "enabled": "%{JS: value('Plugins').indexOf('Bazaar') >= 0}",

    "options":
    [
--- a/share/qtcreator/templates/wizards/projects/vcs/cvs/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/vcs/cvs/wizard.json
@@ -7,7 +7,7 @@
    "trDisplayName": "CVS Checkout",
    "trDisplayCategory": "Import Project",
    "icon": "icon.png",
-    "enabled": "%{JS: [ %{Plugins} ].indexOf('CVS') >= 0}",
+    "enabled": "%{JS: value('Plugins').indexOf('CVS') >= 0}",

    "options":
    [
--- a/share/qtcreator/templates/wizards/projects/vcs/git/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/vcs/git/wizard.json
@@ -7,7 +7,7 @@
    "trDisplayName": "Git Clone",
    "trDisplayCategory": "Import Project",
    "icon": "icon.png",
-    "enabled": "%{JS: [ %{Plugins} ].indexOf('Git') >= 0}",
+    "enabled": "%{JS: value('Plugins').indexOf('Git') >= 0}",

    "options":
    [
--- a/share/qtcreator/templates/wizards/projects/vcs/mercurial/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/vcs/mercurial/wizard.json
@@ -7,7 +7,7 @@
    "trDisplayName": "Mercurial Clone",
    "trDisplayCategory": "Import Project",
    "icon": "icon.png",
-    "enabled": "%{JS: [ %{Plugins} ].indexOf('Mercurial') >= 0}",
+    "enabled": "%{JS: value('Plugins').indexOf('Mercurial') >= 0}",

    "options":
    [
--- a/share/qtcreator/templates/wizards/projects/vcs/subversion/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/vcs/subversion/wizard.json
@@ -7,7 +7,7 @@
    "trDisplayName": "Subversion Checkout",
    "trDisplayCategory": "Import Project",
    "icon": "icon.png",
-    "enabled": "%{JS: [ %{Plugins} ].indexOf('Subversion') >= 0}",
+    "enabled": "%{JS: value('Plugins').indexOf('Subversion') >= 0}",

    "options":
    [