From 7a3c5d43967727b5c12dc4ac3c8034bc752478c4 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 23 May 2019 11:18:42 +0200 Subject: Bump version Change-Id: I92671402ed7066f1a50a00b1cc3e819c4a566b54 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 56c783d8fd93b8d3e13555da6fa398ddb09cce97 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 14 May 2019 09:12:42 +0300 Subject: Use correct path to lib dir -L path was pointing to non-existing directory. Task-number: QTBUG-75802 Change-Id: I9a72c57ef63d8da860c220041c2000ce3f1fefa8 Reviewed-by: Mikko Gronoff Reviewed-by: Joerg Bornemann (cherry picked from commit 2413bc23c5f9995752fdd03d56e480d661fc6fbc) Reviewed-by: Jani Heikkinen --- 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 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() -- cgit v1.2.3 From 9d6cdde0ae4213eb7cc53baab22e183f3c93507d Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Thu, 23 May 2019 15:20:41 +0300 Subject: Add changes file for Qt 5.12.4 Change-Id: I424804d2a3e7f4c2f2e4cc3260e706c48e5bccdd Reviewed-by: Mitch Curtis --- dist/changes-5.12.4 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 dist/changes-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. -- cgit v1.2.3