From b4d8dc1855a6acce3542bc9bd37365fbfc5eefc5 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 1 Nov 2019 15:23:13 +0100 Subject: Fix lipitoolkit build on Ubuntu -L$$OUT_PWD/../../../../lib points to: /home/mitch/dev/qt5.13-debug/qtvirtualkeyboard/src/plugins/lipi-toolkit/plugin/../../../../lib which expands to: /home/mitch/dev/qt5.13-debug/qtvirtualkeyboard/lib I have no lib folder there. This patch changes the pro file to use QT_HOST_LIBS (/home/mitch/dev/qt5.13-debug/qtbase/lib/) and not OUT_PWD, as OUT_PWD refers to where the Makefile is being created in and not where the libraries are actually being built into. Since the libraries are placed where the module/lib path is, using QT_HOST_LIBS will ensure it is in the same location. Change-Id: I1921b18d9362c49174c5ba6b267fe194a963d91c Reviewed-by: Andy Shaw --- src/plugins/lipi-toolkit/plugin/plugin.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/lipi-toolkit/plugin/plugin.pro b/src/plugins/lipi-toolkit/plugin/plugin.pro index e342af14..3364bdd2 100644 --- a/src/plugins/lipi-toolkit/plugin/plugin.pro +++ b/src/plugins/lipi-toolkit/plugin/plugin.pro @@ -26,7 +26,7 @@ include(../../../config.pri) INCLUDEPATH += \ ../3rdparty/lipi-toolkit/src/include \ ../3rdparty/lipi-toolkit/src/util/lib -LIBS += -L$$OUT_PWD/../../../../lib \ +LIBS += -L$$[QT_HOST_LIBS] \ -lshaperecommon$$qtPlatformTargetSuffix() \ -lltkcommon$$qtPlatformTargetSuffix() \ -lltkutil$$qtPlatformTargetSuffix() -- cgit v1.2.3