summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorJukka Passi <jukka.passi@qt.io>2021-04-26 08:47:24 +0300
committerJukka Passi <jukka.passi@qt.io>2021-05-05 10:40:31 +0300
commit0c6e97b6383a1e36cde74a6793f32a47ee76d059 (patch)
treef1c61f68d84f9df122c30b35d355507fd35a6942 /examples
parent192ee85de1695861cdc41c29f79cc9c0a307a7f6 (diff)
Android: Fix build error issue in examples
Added android branch to qtsensors example to get correct library architecture for the build Fixes: QTBUG-56322 Pick-to: 5.15 Change-Id: I6d15a423efdf232d7f187b39cd81606bb64f9a00 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/sensors/grue/lib/lib.pri3
-rw-r--r--examples/sensors/grue/lib/lib.pro1
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/sensors/grue/lib/lib.pri b/examples/sensors/grue/lib/lib.pri
index 0e3da252..675914bc 100644
--- a/examples/sensors/grue/lib/lib.pri
+++ b/examples/sensors/grue/lib/lib.pri
@@ -3,4 +3,5 @@ INCLUDEPATH += $$PWD
macos: LIBS += -L$$OUT_PWD/../grue_app.app/Contents/Frameworks
else: LIBS += -L$$OUT_PWD/..
-LIBS += -lgruesensor
+android: LIBS += -lgruesensor_$${QT_ARCH}
+else: LIBS += -lgruesensor
diff --git a/examples/sensors/grue/lib/lib.pro b/examples/sensors/grue/lib/lib.pro
index cc10e5c4..197d91c8 100644
--- a/examples/sensors/grue/lib/lib.pro
+++ b/examples/sensors/grue/lib/lib.pro
@@ -1,5 +1,6 @@
TEMPLATE = lib
TARGET = gruesensor
+android: TARGET = gruesensor_$${QT_ARCH}
macos: DESTDIR = ../grue_app.app/Contents/Frameworks
else: DESTDIR = $$OUT_PWD/..