0001-remove-weird-install-path-for-example.patch 1.3 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From aef55eb7b3470ba6dee4abc67acda1d308c90e97 Mon Sep 17 00:00:00 2001
  2. From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
  3. Date: Mon, 4 Apr 2016 14:25:54 +0200
  4. Subject: [PATCH 1/1] remove weird install path for example
  5. the deployment system on top should deal with this.
  6. Upstream-Status: Backport [with adaptations]
  7. Change-Id: I1befb3e0c9bb6546afc59a40e525d1d600475a86
  8. Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
  9. Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
  10. [gportay: update basic.pro path]
  11. ---
  12. examples/virtualkeyboard/basic/basic.pro | 8 ++-----
  13. 1 file changed, 2 insertions(+), 6 deletions(-)
  14. diff --git a/examples/virtualkeyboard/basic/basic.pro b/examples/virtualkeyboard/basic/basic.pro
  15. index 28cc4dc..0f71e0e 100644
  16. --- a/examples/virtualkeyboard/basic/basic.pro
  17. +++ b/examples/virtualkeyboard/basic/basic.pro
  18. @@ -7,12 +7,8 @@ static {
  19. QT += svg
  20. QTPLUGIN += qtvirtualkeyboardplugin
  21. }
  22. -android-no-sdk|!isEmpty(CROSS_COMPILE) {
  23. - TARGETPATH = /data/user/qt/virtualkeyboard/basic
  24. -} else {
  25. - TARGETPATH = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
  26. -}
  27. -target.path = $$TARGETPATH
  28. +
  29. +target.path = $$[QT_INSTALL_EXAMPLES]/virtualkeyboard/basic
  30. INSTALLS += target
  31. RESOURCES += \
  32. --
  33. 2.17.1