diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-19 07:29:16 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-05-19 07:29:16 +0300 |
| commit | bce4b6231229e953c3961f3d9858e58555a55d56 (patch) | |
| tree | a55a32aba8087015929f4f5d7c000016cab4a0b3 | |
| parent | 1ab8d6c7257f9ec060739b648704be1cf1c16b05 (diff) | |
| parent | d16186fb9aca8e926f409dd44476b02d8eb490f7 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl
Change-Id: I2a5c99b19feb76c03e0ad6b91a59f0d5a6f9bca4
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | examples/sensors/grue/lib/lib.pri | 3 | ||||
| -rw-r--r-- | examples/sensors/grue/lib/lib.pro | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index b7921871..c9b2fcc1 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.15.4 +MODULE_VERSION = 5.15.5 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/.. |