diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:33:20 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-05 07:33:20 +0100 |
| commit | 0f6d99c67b415169153d90844066226ba4d343d2 (patch) | |
| tree | 63362dee1d65b819318038c7ce532dc99df62801 | |
| parent | ae362d1e7ea48a2620a121f2848a9f12fa82d498 (diff) | |
| parent | 28596bc340ac335a2759099c83db30d5c761d151 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3
Conflicts:
.qmake.conf
Change-Id: I92fd5c3e605d36af7bdf983cd444a919402227f0
| -rw-r--r-- | dist/changes-5.13.2 | 20 | ||||
| -rw-r--r-- | src/plugins/lipi-toolkit/plugin/plugin.pro | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/dist/changes-5.13.2 b/dist/changes-5.13.2 new file mode 100644 index 00000000..e3bb833f --- /dev/null +++ b/dist/changes-5.13.2 @@ -0,0 +1,20 @@ +Qt 5.13.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.13.0 through 5.13.1. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.13 series is binary compatible with the 5.12.x series. +Applications compiled for 5.12 will continue to run with 5.13. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. 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() |