qt5virtualkeyboard: fix patch applied to 2.0 version
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 (cb97d9473b
qt5virtualkeyboard: 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]:aef55eb7b3
Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
0e749a6f30
commit
945a836174
@ -23,13 +23,13 @@ index 28cc4dc..0f71e0e 100644
|
||||
QTPLUGIN += qtvirtualkeyboardplugin
|
||||
}
|
||||
-android-no-sdk|!isEmpty(CROSS_COMPILE) {
|
||||
- TARGETPATH = /data/user/qt/virtualkeyboard
|
||||
- TARGETPATH = /data/user/qt/virtualkeyboard/basic
|
||||
-} else {
|
||||
- TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard
|
||||
- TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
|
||||
-}
|
||||
-target.path = $$TARGETPATH
|
||||
+
|
||||
+target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard
|
||||
+target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
|
||||
INSTALLS += target
|
||||
|
||||
RESOURCES += \
|
||||
|
Loading…
Reference in New Issue
Block a user