diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2019-11-01 15:23:13 +0100 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2019-11-01 15:41:37 +0100 |
commit | b4d8dc1855a6acce3542bc9bd37365fbfc5eefc5 (patch) | |
tree | 4ceed72dc4b027c3ef3b51bd91eb7c5b238c1eb5 /src | |
parent | 57b9af923b30ff301d60d86cf77fbbf1ab53bbbb (diff) |
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 <andy.shaw@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/lipi-toolkit/plugin/plugin.pro | 2 |
1 files changed, 1 insertions, 1 deletions
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() |