From 068dbd3aeff54f9d79c8ee61cc23bdcd5a6bdfbf Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Tue, 21 May 2019 15:05:19 +0200 Subject: [PATCH] Wizards: Take Qt virtual keyboard setting into account ... in the project files. Fixes: QTCREATORBUG-22446 Change-Id: I39f8d6be17ac9fb8f41dd91851578e34c249bfe3 Reviewed-by: Alessandro Portale --- .../templates/wizards/projects/qtquickapplication/app.pro | 5 +++++ .../templates/wizards/projects/qtquickapplication/app.qbs | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro b/share/qtcreator/templates/wizards/projects/qtquickapplication/app.pro index c979910fddb..0ac5682b115 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 0c17914b015..d86ee9b4549 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: []