summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2017-05-30 15:07:44 +0300
committerKari Oikarinen <kari.oikarinen@qt.io>2017-05-31 06:02:40 +0000
commite4248464df4755763aaa245169725c82773bd63b (patch)
tree4db45f92dd9ce72e89771ee5fc2306830597078a /share
parentc34ff88c5a2760b5d664861f007857ffcf179979 (diff)
downloadqt-creator-e4248464df4755763aaa245169725c82773bd63b.tar.gz
Use virtual keyboard with Boot2Qdb plugin also
Starting from 5.9 Boot2Qt devices are supported with a new plugin and projects created with wizards should still use virtual keyboard for them. Task-number: QTCREATORBUG-18247 Change-Id: I5dcc6436d49d29cb8956a2b7d5eec72ff5542f10 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json2
-rw-r--r--share/qtcreator/templates/wizards/projects/qtquickcontrols2application/wizard.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
index a084c4ceb9..94b40dec18 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
@@ -24,7 +24,7 @@
{ "key": "QtQuickFeature", "value": "QtSupport.Wizards.FeatureQtQuick.%{QtQuickVersion}" },
{ "key": "UiSupport", "value": "%{JS: '%{QtQuickVersion}' !== '2.3' }" },
{ "key": "IsUiFileInUse", "value": "%{JS: %{UiSupport} && %{QmlUiSplit} }" },
- { "key": "UseVirtualKeyboard", "value": "%{JS: [ %{Plugins} ].indexOf('Boot2Qt') >= 0}" }
+ { "key": "UseVirtualKeyboard", "value": "%{JS: [ %{Plugins} ].indexOf('Boot2Qt') >= 0 || [ %{Plugins} ].indexOf('Boot2QtQdb') >= 0}" }
],
"pages":
diff --git a/share/qtcreator/templates/wizards/projects/qtquickcontrols2application/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickcontrols2application/wizard.json
index 4d470e327b..4593ef8dbb 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickcontrols2application/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickcontrols2application/wizard.json
@@ -22,7 +22,7 @@
{ "key": "QtQuickDialogsVersion", "value": "1.0" },
{ "key": "QtQuickLayoutsVersion", "value": "1.3" },
{ "key": "QtQuickVirtualKeyboardVersion", "value": "2.1" },
- { "key": "UseVirtualKeyboard", "value": "%{JS: [ %{Plugins} ].indexOf('Boot2Qt') >= 0}" }
+ { "key": "UseVirtualKeyboard", "value": "%{JS: [ %{Plugins} ].indexOf('Boot2Qt') >= 0 || [ %{Plugins} ].indexOf('Boot2QtQdb') >= 0}" }
],
"pages":