Skip to content

Commit

Permalink
qt5virtualkeyboard: fix patch applied to 2.0 version
Browse files Browse the repository at this point in the history
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
(cb97d94 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 buildroot#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]: qt/qtvirtualkeyboard@aef55eb

Signed-off-by: Gaël PORTAY <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
  • Loading branch information
gportay authored and tpetazzoni committed Sep 5, 2018
1 parent 0e749a6 commit 945a836
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 += \
Expand Down

0 comments on commit 945a836

Please sign in to comment.