diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2019-10-10 10:06:22 +0300 |
|---|---|---|
| committer | Antti Määttä <antti.maatta@qt.io> | 2020-10-16 05:07:37 +0000 |
| commit | 662cce3cdbcba75e76c77c09358834e312d3e0ce (patch) | |
| tree | 77cc0ebbab4f27a41a5a8e9363421f7b09f281fd /tools/viewer/viewer.pro | |
| parent | 747ed180415327c1ece00cc469a1a6170066a0ae (diff) | |
Fix wrong lib paths in android buildv2.8.0-rc2
Task-number: QT3DS-3982
Change-Id: Ifc01400a6756e3ee66765a5b37fa9d805f58f99c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'tools/viewer/viewer.pro')
| -rw-r--r-- | tools/viewer/viewer.pro | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tools/viewer/viewer.pro b/tools/viewer/viewer.pro index fc750b7..64f58ed 100644 --- a/tools/viewer/viewer.pro +++ b/tools/viewer/viewer.pro @@ -46,9 +46,11 @@ HEADERS += \ $$PWD/../../src/api/studio3d/q3dsdatainput.h } +!android { LIBS += \ -lqt3dsopengl$$qtPlatformTargetSuffix() \ -lqt3dsqmlstreamer$$qtPlatformTargetSuffix() +} macos:QMAKE_RPATHDIR += @executable_path/../../../../lib @@ -73,3 +75,14 @@ contains(ANDROID_TARGET_ARCH,arm64-v8a) { ANDROID_PACKAGE_SOURCE_DIR = \ $$PWD/android } + +android { + # qt prl files contain hard coded paths to android ndk so don't link against them + # If libraries are missing because of this they need to be added separately + CONFIG -= link_prl + LIBS += \ + $$OUT_PWD/../../lib/libqt3dsopengl$$qtPlatformTargetSuffix().so \ + $$OUT_PWD/../../lib/libqt3dsqmlstreamer$$qtPlatformTargetSuffix().so + + QT += quick +} |