diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2019-05-21 15:05:19 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-05-21 14:40:52 +0000 |
commit | 068dbd3aeff54f9d79c8ee61cc23bdcd5a6bdfbf (patch) | |
tree | cdd113fb709f506748dda20a9859bb2ab18f8350 /share/qtcreator/templates | |
parent | 23a71e85bf85e701970ed96a75f00419342047d8 (diff) |
Wizards: Take Qt virtual keyboard setting into account
... in the project files.
Fixes: QTCREATORBUG-22446
Change-Id: I39f8d6be17ac9fb8f41dd91851578e34c249bfe3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'share/qtcreator/templates')
-rw-r--r-- | share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro | 5 | ||||
-rw-r--r-- | share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro index c979910fdd..0ac5682b11 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro @@ -1,4 +1,9 @@ +@if "%{UseVirtualKeyboard}" == "true" +QT += quick virtualkeyboard +@else QT += quick +@endif + CONFIG += c++11 # The following define makes your compiler emit warnings if you use diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs index 0c17914b01..d86ee9b454 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.qbs @@ -1,7 +1,11 @@ import qbs Application { +@if "%{UseVirtualKeyboard}" == "true" + Depends { name: "Qt"; submodules: "quick", "virtualkeyboard" } +@else Depends { name: "Qt.quick" } +@endif // Additional import path used to resolve QML modules in Qt Creator's code model property pathList qmlImportPaths: [] |