2018-07-01 05:07:03 +02:00
|
|
|
From aef55eb7b3470ba6dee4abc67acda1d308c90e97 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
|
|
|
|
|
Date: Mon, 4 Apr 2016 14:25:54 +0200
|
|
|
|
|
Subject: [PATCH 1/1] remove weird install path for example
|
|
|
|
|
|
|
|
|
|
the deployment system on top should deal with this.
|
|
|
|
|
|
|
|
|
|
Upstream-Status: Backport [with adaptations]
|
|
|
|
|
Change-Id: I1befb3e0c9bb6546afc59a40e525d1d600475a86
|
|
|
|
|
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
|
|
|
|
|
[gportay: update basic.pro path]
|
|
|
|
|
---
|
|
|
|
|
examples/virtualkeyboard/basic/basic.pro | 8 ++-----
|
|
|
|
|
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/examples/virtualkeyboard/basic/basic.pro b/examples/virtualkeyboard/basic/basic.pro
|
|
|
|
|
index 28cc4dc..0f71e0e 100644
|
|
|
|
|
--- a/examples/virtualkeyboard/basic/basic.pro
|
|
|
|
|
+++ b/examples/virtualkeyboard/basic/basic.pro
|
|
|
|
|
@@ -7,12 +7,8 @@ static {
|
|
|
|
|
QT += svg
|
|
|
|
|
QTPLUGIN += qtvirtualkeyboardplugin
|
|
|
|
|
}
|
|
|
|
|
-android-no-sdk|!isEmpty(CROSS_COMPILE) {
|
2018-09-03 14:37:44 +02:00
|
|
|
- TARGETPATH = /data/user/qt/virtualkeyboard/basic
|
2018-07-01 05:07:03 +02:00
|
|
|
-} else {
|
2018-09-03 14:37:44 +02:00
|
|
|
- TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
|
2018-07-01 05:07:03 +02:00
|
|
|
-}
|
|
|
|
|
-target.path = $$TARGETPATH
|
|
|
|
|
+
|
2018-09-03 14:37:44 +02:00
|
|
|
+target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
|
2018-07-01 05:07:03 +02:00
|
|
|
INSTALLS += target
|
|
|
|
|
|
|
|
|
|
RESOURCES += \
|
|
|
|
|
--
|
|
|
|
|
2.17.1
|
|
|
|
|
|
