From b46081e233c18026c15504e07bb9c0c9f228906b Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Mon, 16 Dec 2019 15:22:34 +0100 Subject: Bump version Change-Id: I77aa4c0aaf3485b55f63ef2ce166aed3d00c8c53 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index f6895bb..09a75f0 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.14.0 +MODULE_VERSION = 5.14.1 -- cgit v1.2.3 From ad587da5460a2c8ca90422dc3d61f0e16ec6e7c2 Mon Sep 17 00:00:00 2001 From: Marius Kittler Date: Sun, 15 Dec 2019 16:18:22 +0100 Subject: Use pkg-config to find dependencies Change-Id: Ifa826410494f65a560fe8dea999d4665f2f1191b Reviewed-by: Thiago Macieira --- src/imageformats/configure.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json index 3b38fae..5ece40b 100644 --- a/src/imageformats/configure.json +++ b/src/imageformats/configure.json @@ -34,7 +34,8 @@ ] }, "sources": [ - "-ljasper" + { "type": "pkgConfig", "args": "jasper" }, + { "libs": "-ljasper" } ] }, "mng": { @@ -55,7 +56,8 @@ ] }, "sources": [ - "-lmng" + { "type": "pkgConfig", "args": "libmng" }, + { "libs": "-lmng" } ] }, "tiff": { @@ -82,7 +84,8 @@ ] }, "sources": [ - "-ltiff" + { "type": "pkgConfig", "args": "libtiff-4" }, + { "libs": "-ltiff" } ] }, "webp": { @@ -112,7 +115,8 @@ ] }, "sources": [ - "-lwebp -lwebpdemux -lwebpmux" + { "type": "pkgConfig", "args": "libwebp libwebpmux libwebpdemux" }, + { "libs": "-lwebp -lwebpdemux -lwebpmux" } ] } }, -- cgit v1.2.3 From 80249142d9407cb355c2a0bd5cbbdaa6800f8aba Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 27 Nov 2019 13:34:02 +0100 Subject: Disable the webp plugin for winrt on ARM There is a bug in libwebp which prevents building the plugin for an ARM winrt configuration. Until the bug is fixed upstream, the feature should not be available for these configurations. Task-number: QTBUG-71251 Change-Id: I10313d4fe63dc25cefed3153d9acf1f3b12c05a4 Reviewed-by: Joerg Bornemann Reviewed-by: Eirik Aavitsland --- src/imageformats/configure.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json index 5ece40b..5099790 100644 --- a/src/imageformats/configure.json +++ b/src/imageformats/configure.json @@ -155,7 +155,7 @@ "webp": { "label": "WEBP", "disable": "input.webp == 'no'", - "condition": "features.imageformatplugin", + "condition": "features.imageformatplugin && !(config.winrt && arch.arm)", "output": [ "privateFeature" ] -- cgit v1.2.3 From 90f384644991b72728202b0a3edf6b079ba6989a Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Thu, 5 Dec 2019 14:52:07 +0100 Subject: winrt: Disable libtiff for x86 configurations For some reason the build of libtiff fails during linking for x86 configurations (unresolved symbols GetFileSize & CreateFile) while it works as expected for x64 and arm. Disable that configuration, but keep support for working scenarios. Task-number: QTBUG-71251 Change-Id: I181a42378584af8c2fffccbb3ddd252e4a057dfb Reviewed-by: Joerg Bornemann --- src/imageformats/configure.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json index 5099790..4718398 100644 --- a/src/imageformats/configure.json +++ b/src/imageformats/configure.json @@ -140,7 +140,7 @@ "tiff": { "label": "TIFF", "disable": "input.tiff == 'no'", - "condition": "features.imageformatplugin", + "condition": "features.imageformatplugin && !(config.winrt && arch.i386)", "output": [ "privateFeature" ] -- cgit v1.2.3 From 31338f220f1ad1d0b8c050c48b04e733c4b62e1b Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Tue, 26 Nov 2019 14:19:27 +0100 Subject: Do not explicitly disable plugins for winrt The ability of building these plugins is part of configure.json and should not be hard coded. The plugins can be built for winrt. Fixes: QTBUG-71251 Change-Id: I9a6b0dcdd031d37339282caab4596978c52ae5a0 Reviewed-by: Qt CI Bot Reviewed-by: Eirik Aavitsland --- src/plugins/imageformats/imageformats.pro | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro index be1e20a..4116591 100644 --- a/src/plugins/imageformats/imageformats.pro +++ b/src/plugins/imageformats/imageformats.pro @@ -21,9 +21,3 @@ qtConfig(jasper) { } else:darwin: { SUBDIRS += macjp2 } - -winrt { - SUBDIRS -= tiff \ - tga \ - webp -} -- cgit v1.2.3