diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:33:37 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-17 12:33:37 +0200 |
| commit | 18e9a489d4d763c4e1e4771d9beee6a2e237349d (patch) | |
| tree | a61e879aa4d85900b576433e8c3c732cd085c4f5 | |
| parent | a826da7d9bee9bd96c84ceaba5f102f66fc538cd (diff) | |
| parent | d1940b2141e2bbc945905e10362a1565a05fb5d0 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | dist/changes-5.12.4 | 20 | ||||
| -rw-r--r-- | src/plugins/lipi-toolkit/plugin/plugin.pro | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1bf9543a..f1a6177b 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.12.3 +MODULE_VERSION = 5.12.4 diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4 new file mode 100644 index 00000000..a285cd8e --- /dev/null +++ b/dist/changes-5.12.4 @@ -0,0 +1,20 @@ +Qt 5.12.4 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.12.0 through 5.12.3. + +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.12 series is binary compatible with the 5.11.x series. +Applications compiled for 5.11 will continue to run with 5.12. + +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 c3a12440..e342af14 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$$OUT_PWD/../../../../lib \ -lshaperecommon$$qtPlatformTargetSuffix() \ -lltkcommon$$qtPlatformTargetSuffix() \ -lltkutil$$qtPlatformTargetSuffix() |