945a836174
The patch 0001-remove-weird-install-path-for-example.patch using patch: does not apply properly and needs to be fixed. The patch was backported from 5.7 [1] with path adaptation in commit (cb97d9473bqt5virtualkeyboard: allow to build with qt5.6), but the submitted patch did not reflect that said adaptation. Apply the said patch adaptation (i.e. add missing basic subdirectory) to apply properly the patch. Fixes: >>> qt5virtualkeyboard 2.0 Patching Applying 0001-remove-weird-install-path-for-example.patch using patch: patching file examples/virtualkeyboard/basic/basic.pro Hunk #1 FAILED at 7. 1 out of 1 hunk FAILED -- saving rejects to file examples/virtualkeyboard/basic/basic.pro.rej make: ***[/home/test/autobuild/run/instance-2/output/build/qt5virtualkeyboard-2.0/.stamp_patched] Error 1 [1]:aef55eb7b3Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
39 lines
1.3 KiB
Diff
39 lines
1.3 KiB
Diff
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) {
|
|
- TARGETPATH = /data/user/qt/virtualkeyboard/basic
|
|
-} else {
|
|
- TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
|
|
-}
|
|
-target.path = $$TARGETPATH
|
|
+
|
|
+target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
|
|
INSTALLS += target
|
|
|
|
RESOURCES += \
|
|
--
|
|
2.17.1
|
|
|