summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2020-09-13 13:30:56 +0200
committerMartchus2020-09-13 13:30:56 +0200
commit6d17f19b24ea4dc27d6be759bafbcce8b54bd012 (patch)
treea6687000ddf8b79e31a21f9c55ecd17b651edf28
parent8598b5e1679cfdd50942e06d32dee06292b579b5 (diff)
downloadaur-6d17f19b24ea4dc27d6be759bafbcce8b54bd012.tar.gz
Update to 5.15.1
-rw-r--r--.SRCINFO68
-rw-r--r--0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch4
-rw-r--r--0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch4
-rw-r--r--0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch4
-rw-r--r--0004-Make-sure-.pc-files-are-installed-correctly.patch6
-rw-r--r--0005-Don-t-add-resource-files-to-LIBS-parameter.patch8
-rw-r--r--0006-Prevent-debug-library-names-in-pkg-config-files.patch4
-rw-r--r--0007-Fix-linking-against-shared-static-libpng.patch6
-rw-r--r--0008-Fix-linking-against-static-D-Bus.patch8
-rw-r--r--0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch6
-rw-r--r--0010-Fix-linking-against-static-freetype2.patch6
-rw-r--r--0011-Fix-linking-against-static-harfbuzz.patch6
-rw-r--r--0012-Fix-linking-against-static-pcre.patch6
-rw-r--r--0013-Fix-linking-against-shared-static-MariaDB.patch4
-rw-r--r--0014-Fix-linking-against-shared-static-PostgreSQL.patch4
-rw-r--r--0015-Rename-qtmain-to-qt5main.patch4
-rw-r--r--0016-Enable-rpath-for-build-tools.patch4
-rw-r--r--0017-Use-system-zlib-for-build-tools.patch4
-rw-r--r--0018-Merge-shared-and-static-library-trees.patch14
-rw-r--r--0019-Use-.dll.a-as-import-lib-extension.patch10
-rw-r--r--0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch20
-rw-r--r--0021-Allow-usage-of-static-version-with-CMake.patch70
-rw-r--r--0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch8
-rw-r--r--0023-Use-correct-pkg-config-static-flag.patch8
-rw-r--r--0024-Fix-macro-invoking-moc-rcc-and-uic.patch6
-rw-r--r--0025-Ignore-errors-about-missing-feature-static.patch4
-rw-r--r--0026-Enable-and-fix-use-of-iconv.patch4
-rw-r--r--0027-Ignore-failing-pkg-config-test.patch8
-rw-r--r--0028-Prevent-qmake-from-messing-static-lib-dependencies.patch6
-rw-r--r--0029-Hardcode-linker-flags-for-platform-plugins.patch60
-rw-r--r--0030-Fix-linking-against-static-plugins-with-qmake.patch8
-rw-r--r--0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch4
-rw-r--r--PKGBUILD70
-rw-r--r--qtbase-sha256.txt2
34 files changed, 243 insertions, 215 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dea3da1ed36..605bc124976 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt5-base
pkgdesc = A cross-platform application and UI framework, native OpenGL backend (mingw-w64)
- pkgver = 5.15.0
+ pkgver = 5.15.1
pkgrel = 1
url = https://www.qt.io/
arch = i686
@@ -32,7 +32,7 @@ pkgbase = mingw-w64-qt5-base
options = !buildflags
options = staticlibs
options = !emptydirs
- source = https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz
+ source = https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtbase-everywhere-src-5.15.1.tar.xz
source = 0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
source = 0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
source = 0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -64,38 +64,38 @@ pkgbase = mingw-w64-qt5-base
source = 0029-Hardcode-linker-flags-for-platform-plugins.patch
source = 0030-Fix-linking-against-static-plugins-with-qmake.patch
source = 0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
- sha256sums = 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5
- sha256sums = 03fbaa97d7e867db4f73c36045010c915d69e14d8de82fba886db6dbb5f2c19a
- sha256sums = 25a28f49c2403fd7352736e29bcd25b7fcfb761b469515f773e782f2bdee7535
- sha256sums = d0d83f1ef804f0012bea97f1f2c838d650a50556ec1635d5adbf6c8c155abd7e
- sha256sums = 288ee263514ac6bab04245f3f3403511225a4d135a8db290777f68a91072b9ca
- sha256sums = 1a25dc976dcd763edb2ca9431083b88b3f4d075104dfbc4aa84ab3ce6e009896
- sha256sums = 0e81316237392605a09fba67c4fc8d0c596f1b2306b4a5de56e2fc857ef270eb
- sha256sums = 1371046f24787eb1b7cb7779d5b5f792dd0e96c01fb83abea53dc1d7a3671409
- sha256sums = be86f463255a0a146d80ff6d12d3faf9abca6eb65a8a2ce1cba1e9a27d24aad4
- sha256sums = 6fd65bf739e9c27e837e73bcb5c203d1d6692e551b05f285f9205fa3818652ec
- sha256sums = 42c7c59dd5b0d30659c72ff6405a931bdc286278cac4d197da67f565e4b42ba7
- sha256sums = a146c63f13af1ab095ce0d7709e61a96a595c74715f98d6370ad4a42e2361466
- sha256sums = 68ca7b583d40b8eaf6f3f022256f26e041a5e845c435c17a1462d2a825901f62
- sha256sums = 9ea635d6aed7d9af8eae17282dcf4e40b9259d03a7afd3af3d9f62e85abda65d
- sha256sums = 11112caf945e199bca20d1adad09990e348d078fd99567be037fd02ef5081174
- sha256sums = 39e3fec01c9e823c16219b289babdc8c5af597cfe5496b681f4acc960de2dadb
- sha256sums = 1b1bed9052a0f7666bbfd99d0a2e21e146e5b24d1967b80367ab0df55c3f3474
- sha256sums = 896360b605d5b47db2c8459c620a1c07a5951efa702734c58dfb773396dc328b
- sha256sums = d339e29673f2ec6f3ae7c4b6f64188b0686946b0ad5a99c6721fa99dc123bb70
- sha256sums = 0ac665c9c982be0b35d249bec3e38b8d95c8539a9e68379216994e01f32daaff
- sha256sums = 8aceb87b3ec8a77bec3f0826dd81325447acdeff4e7179d464f1d1440f867e9e
- sha256sums = fc65b1578af0e6f7883b1f7769d6b333f48bf2d9aa4c2c6423db24237079473f
- sha256sums = 8c13620f2b35e3b9abc772cef2bf28d1873e3a230c49f19eed1fd305903825c7
- sha256sums = 227fd12bda01bd023c5f353b3b3c42bc8b14dbd3fd0fc7e78b0ee5fe16017b26
- sha256sums = a63e76c896c2fafef4f457b95d547631d86845d2bb6d414a64d0ffa391dd21ef
- sha256sums = a80a47c4d40e61431cf0357ab14d1634eadec9add509c995e7ff4ee417bd2065
- sha256sums = 563169bc4886659f026ab35f92175828265385fbfebce44b23565f7de35a1420
- sha256sums = a90671b2188cd76e9d950793d4d41cf2ec54d8f4d3adbc1d966efafc313d2b3a
- sha256sums = 25a6eabbd5ae5b2f3b86ec36b0d6a298cc9f3df5dd3190abcbd24f54d662da9c
- sha256sums = d69836ba35570985c271ce84a4c6833f33436696e8e25ecb23e27f3e498aa696
- sha256sums = 3b5ea2572e65c52ff988a97e988f7f4a36a20973c63afb047db6d8a2b67a2dc5
- sha256sums = c8181d71a5209983e4659c1bb11957fb0199e0c7e66808e5cb877e5876c704be
+ sha256sums = 33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c
+ sha256sums = fec4ca039859f9cc9685b34a7bd2da9e0fe24b5b1f85d7cd12665631fa797b44
+ sha256sums = a0ea35e6eef4fed06360efa05e11b898f6033d893e1f1657a240cc03e43f076e
+ sha256sums = cda13b2856fafe92b1369d6f2d01bd4d9bbdb0ec96c25e91e48ba25267c74c6c
+ sha256sums = e13cd18ad781512862b5d288a53ebd09dc0e8bcc6fd3c4e833d0c593f28edd3a
+ sha256sums = 273af9db2954c1d62e29d2a8328bbfa918bae617456aff6645df4bfb72796e0d
+ sha256sums = 84a801d904fe308a56a9112af9aa73656eacf36ed7684449363281bfe4108543
+ sha256sums = 190795aa778ae4e7bd8a74ce56504c697435129b73d2f0418511a4a230f68bc5
+ sha256sums = 3fff6151dcf76bed12864dba51e4d04d39f8b3969c502a71ed547b527b310d7a
+ sha256sums = 56240f509157a04ba1f1a23b0e058c2212d66e34aca68a688c15f5d8804bf174
+ sha256sums = 02ca3a112f3e35749c141ed9c7e87a1fd0e82aa852541024b85f40a99d24d9fc
+ sha256sums = 3b4dcce669d359953603257e621e6ebc30fb88f0f1c48b35ec443c574f2b05e8
+ sha256sums = ba302124391aea5438e82195dd276edd8942f04cff7c6b85a9f0a5279749566b
+ sha256sums = 68b5f9e0535c8d030161e67a0e8ee8bec2a80a9c8f69c09a4ad25fe98eb9dfd2
+ sha256sums = ab46b53eb6272185a05d11820317db421be6e4440166967911e7d59d4f0a03d4
+ sha256sums = c11a14a02e48e39e8212097915aed2347825a33022d367f322e34f3aaaf33f90
+ sha256sums = 6d7c8fd7a162174355dd12399bd8f47f470557751dc117271c02e2e7b385d424
+ sha256sums = 3c28f5658e0f960091c1991586167ee06bcecd8d843123fbf37ab78a1f5f30f0
+ sha256sums = f9545474bd73be049dbf84fc2ff455e924e6fb29bb807809c384bf56a0227ad6
+ sha256sums = 2998069e3a427c940f496d75df4cea05acb10d3e82c333a5c957e37f0543a0e8
+ sha256sums = a301ddcd46b9b2fb58d592af88ac6acf81b2dbd328fb8c4c3ef49abffe343267
+ sha256sums = 3d1257390ff151365d7fa29cde5f9c118310fe727243fb6f50ad30ab117c3384
+ sha256sums = 19534087d5fc4b434859d68476ebd0647fdc04bf78f24943b7ab88cccf09b08a
+ sha256sums = 5a57c66303d4a898dd5cccd9c639f367b50b508256fdf9c00ba5179bb00d701c
+ sha256sums = 84b9e41b7320834a73edf1d192e511801feb51cd2de60ecc28e46982cd572df4
+ sha256sums = 85bba2428090518dca878ca117299b065913f125c00cede57b31d37a02d0b787
+ sha256sums = f0429a442805c2e0181e8b3b7814259586fdcba000bf324c0e367858c351f6b1
+ sha256sums = c8479468cfb4a70fe65a1317f3fbacd40dcdc7a8bafc88648160509ee8b216e8
+ sha256sums = a2eb9e683b12efe7fbb365749bdd5373e0fbf6438fe5342effab93f3a262d808
+ sha256sums = 4c097460c443ec0ca47a41ea1ad6fdaa08e394b7a883d54da69bf9557ccbea31
+ sha256sums = e1f2b8bfe9f3cdacceb6d9b73573ad39ea73ac0fce74448c7df0262b34b703bb
+ sha256sums = 553c15e8cf230c3d3f3fa4c4a7a5a46d18027a4d6c7493f3eab56ca97bd906d9
pkgname = mingw-w64-qt5-base
diff --git a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
index 3f2da7e287f..deb6dcd8f5b 100644
--- a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@@ -1,4 +1,4 @@
-From c06d6c088bb5bd20ef531f38beb9f5eb8b2f8045 Mon Sep 17 00:00:00 2001
+From 14c05838f544ef232c784aa546f2a11b4cf2593e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 18:30:51 +0100
Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with
@@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644
QMAKE_LINK = $${CROSS_COMPILE}g++
--
-2.26.2
+2.28.0
diff --git a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
index d7243c6b82f..255b881a417 100644
--- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -1,4 +1,4 @@
-From d87ff34ab62714aa4aaf77788285b2d00eaa42dc Mon Sep 17 00:00:00 2001
+From 9fa2f31eb911ab3d64286af43961b7fe0b8afbea Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:36:53 +0200
Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL
@@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
#ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
#include <stdio.h>
--
-2.26.2
+2.28.0
diff --git a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
index d0b63b27f1c..e7c5c11f1b8 100644
--- a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -1,4 +1,4 @@
-From fdbae98369593e87e93fe093944804fcf3ca532f Mon Sep 17 00:00:00 2001
+From f6042da88367558cd294c2593c8cc3a6e8949667 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:48:51 +0200
Subject: [PATCH 03/31] Fix too many sections assemler error in OpenGL factory
@@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
HEADERS += opengl/qopengl.h \
opengl/qopengl_p.h \
--
-2.26.2
+2.28.0
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch
index 4102e8b3db5..97d28d1fb59 100644
--- a/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/0004-Make-sure-.pc-files-are-installed-correctly.patch
@@ -1,4 +1,4 @@
-From 327b095fbcb10ed66342db3d68eeac1322c73124 Mon Sep 17 00:00:00 2001
+From dcc115680078ce6d4c9682736b9b1fdf09abec63 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:54:12 +0200
Subject: [PATCH 04/31] Make sure *.pc files are installed correctly
@@ -49,7 +49,7 @@ index a96b9c54da..5a7913be7a 100644
void writePkgConfigFile(); // for pkg-config
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 6cbd20c187..fb9558055d 100644
+index 5e446bd7e2..183cef2908 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -775,7 +775,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
@@ -62,5 +62,5 @@ index 6cbd20c187..fb9558055d 100644
uninst.append("\n\t");
uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
--
-2.26.2
+2.28.0
diff --git a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
index 98cccfe588e..cce33fa07b0 100644
--- a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,4 +1,4 @@
-From e255d761b2795b2525a4b94e27b6e77a8fdc2884 Mon Sep 17 00:00:00 2001
+From a580a7539f99448391f2b16903f8746d610f131a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:58:28 +0200
Subject: [PATCH 05/31] Don't add resource files to LIBS parameter
@@ -11,10 +11,10 @@ like .obj/debug/Qt5Cored_resource_res.o
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
-index 096b041056..eb498b28e8 100644
+index ee9a41838b..8d1dcae85b 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
-@@ -152,7 +152,7 @@ void MingwMakefileGenerator::init()
+@@ -147,7 +147,7 @@ void MingwMakefileGenerator::init()
processVars();
@@ -24,5 +24,5 @@ index 096b041056..eb498b28e8 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
-2.26.2
+2.28.0
diff --git a/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
index 4721cc1b6cc..8070d2ed527 100644
--- a/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,4 +1,4 @@
-From dd50dd544fbf94606c08fa57b0393df24282c28b Mon Sep 17 00:00:00 2001
+From 006235cdee71011db441e0ea5265cb9c93937f6c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:01:14 +0200
Subject: [PATCH 06/31] Prevent debug library names in pkg-config files
@@ -29,5 +29,5 @@ index e94084381c..8e4d11484f 100644
QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
if(!subdir.isEmpty()) {
--
-2.26.2
+2.28.0
diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch
index c218ba9766b..c777ccaf27e 100644
--- a/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/0007-Fix-linking-against-shared-static-libpng.patch
@@ -1,4 +1,4 @@
-From 88a8b2b376adccd0cb520095a67bbee4d7044841 Mon Sep 17 00:00:00 2001
+From 7122a1ddd12d8852ed31fc4cc2f6523f09f66363 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 26 Jan 2017 17:51:31 +0100
Subject: [PATCH 07/31] Fix linking against shared/static libpng
@@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 5ebcdb99b5..bb6bc488e8 100644
+index 1f08795c57..7a5fc6ce7a 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -399,8 +399,10 @@
@@ -26,5 +26,5 @@ index 5ebcdb99b5..bb6bc488e8 100644
],
"use": [
--
-2.26.2
+2.28.0
diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch
index 9962a031533..160eb9c3541 100644
--- a/0008-Fix-linking-against-static-D-Bus.patch
+++ b/0008-Fix-linking-against-static-D-Bus.patch
@@ -1,4 +1,4 @@
-From ad6970df8b2a43767bc93b3e7cc40f3c41f8051c Mon Sep 17 00:00:00 2001
+From 4898dc76052b6d77f99e56270979a4bb251998c5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 19:36:25 +0100
Subject: [PATCH 08/31] Fix linking against static D-Bus
@@ -9,7 +9,7 @@ Subject: [PATCH 08/31] Fix linking against static D-Bus
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/configure.json b/configure.json
-index d1eb1d8102..dc34ec86c0 100644
+index 50d69b740d..2433da3c20 100644
--- a/configure.json
+++ b/configure.json
@@ -188,18 +188,23 @@
@@ -39,7 +39,7 @@ index d1eb1d8102..dc34ec86c0 100644
{ "libs": "-ldbus-1", "condition": "!config.win32" }
]
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
-index 7cce0d71aa..4d3d774d45 100644
+index accaa4f5ed..4b11c74caa 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -57,6 +57,10 @@
@@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
# include <dbus/dbus.h>
#else
--
-2.26.2
+2.28.0
diff --git a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
index feaaa181338..08f2ac7f637 100644
--- a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@@ -1,4 +1,4 @@
-From a2c69570b5c69a8eb5596b9f5d9bc83ca80aec79 Mon Sep 17 00:00:00 2001
+From 39cac9030befe8b2d490b3397c99fe5bbbd935b6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 18:28:10 +0200
Subject: [PATCH 09/31] Don't try to use debug version of D-Bus library
@@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.json b/configure.json
-index dc34ec86c0..8bc5d3dd8a 100644
+index 2433da3c20..bde226843b 100644
--- a/configure.json
+++ b/configure.json
@@ -201,7 +201,7 @@
@@ -25,5 +25,5 @@ index dc34ec86c0..8bc5d3dd8a 100644
},
"condition": "config.win32 && features.shared"
--
-2.26.2
+2.28.0
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch
index 9471d57a34a..682678f7c69 100644
--- a/0010-Fix-linking-against-static-freetype2.patch
+++ b/0010-Fix-linking-against-static-freetype2.patch
@@ -1,4 +1,4 @@
-From a9ec56ae29485985bb2a073df3cf8a097c3b4809 Mon Sep 17 00:00:00 2001
+From 788846ebc422894f3e6aa8f39485e0ab88abe81a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 3 Feb 2017 20:51:19 +0100
Subject: [PATCH 10/31] Fix linking against static freetype2
@@ -8,7 +8,7 @@ Subject: [PATCH 10/31] Fix linking against static freetype2
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
-index bb6bc488e8..12c1995708 100644
+index 7a5fc6ce7a..b117f6fff6 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -238,8 +238,11 @@
@@ -26,5 +26,5 @@ index bb6bc488e8..12c1995708 100644
{ "libs": "-lfreetype" }
],
--
-2.26.2
+2.28.0
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch
index 9c16e90c07d..062c21f42ba 100644
--- a/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/0011-Fix-linking-against-static-harfbuzz.patch
@@ -1,4 +1,4 @@
-From 20070311343c73fc883f64b25246e8659d2f7c1c Mon Sep 17 00:00:00 2001
+From 0fb1b65cd6c37419e0292b90a47e1d4682cbb042 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:22:56 +0200
Subject: [PATCH 11/31] Fix linking against static harfbuzz
@@ -8,7 +8,7 @@ Subject: [PATCH 11/31] Fix linking against static harfbuzz
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 12c1995708..e7e1728ba4 100644
+index b117f6fff6..2a0207920a 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -306,7 +306,11 @@
@@ -25,5 +25,5 @@ index 12c1995708..e7e1728ba4 100644
},
"imf": {
--
-2.26.2
+2.28.0
diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch
index a9a63fbbdb8..28b23b6848c 100644
--- a/0012-Fix-linking-against-static-pcre.patch
+++ b/0012-Fix-linking-against-static-pcre.patch
@@ -1,4 +1,4 @@
-From 37eca8f75fc47c2709809b053fa7b4858fca7e5c Mon Sep 17 00:00:00 2001
+From f67ffa152627401a4daba9dea452acc4a6cb5621 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:24:01 +0200
Subject: [PATCH 12/31] Fix linking against static pcre
@@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
1 file changed, 4 insertions(+)
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
-index d74b759aa9..6aca6caaef 100644
+index 729269d0f4..128baafd56 100644
--- a/src/corelib/text/qregularexpression.cpp
+++ b/src/corelib/text/qregularexpression.cpp
@@ -53,6 +53,10 @@
@@ -24,5 +24,5 @@ index d74b759aa9..6aca6caaef 100644
#include <pcre2.h>
--
-2.26.2
+2.28.0
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch
index 3dd5c5686ea..2347714da5b 100644
--- a/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/0013-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,4 +1,4 @@
-From aa0918bd2b83d0e9caed77b0bdbe1092edcc8ee9 Mon Sep 17 00:00:00 2001
+From d3170e1695855d72ca9a1e093a20d88ae12372ef Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:56:55 +0200
Subject: [PATCH 13/31] Fix linking against shared/static MariaDB
@@ -22,5 +22,5 @@ index 28ccbeadcd..7262914c64 100644
{ "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
{ "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
--
-2.26.2
+2.28.0
diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
index 0fc3c50cdaa..a9f801d18f6 100644
--- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,4 +1,4 @@
-From 51188881323e4563e58e6e32b4ac30478c5e56ef Mon Sep 17 00:00:00 2001
+From 997237bc94e9f12d309e55a119002be7496dd280 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:58:25 +0200
Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL
@@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644
]
},
--
-2.26.2
+2.28.0
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch
index 6cafdb27278..42308a30e37 100644
--- a/0015-Rename-qtmain-to-qt5main.patch
+++ b/0015-Rename-qtmain-to-qt5main.patch
@@ -1,4 +1,4 @@
-From 3d8c9c9a7b35b0d2fa749b272bd57cab188a4834 Mon Sep 17 00:00:00 2001
+From 7ef86aea3eaffb36605e5d53e8fd6759e0931699 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 14:25:40 +0200
Subject: [PATCH 15/31] Rename qtmain to qt5main
@@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
CONFIG += static
--
-2.26.2
+2.28.0
diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch
index e535f5127a7..659a0ac70f9 100644
--- a/0016-Enable-rpath-for-build-tools.patch
+++ b/0016-Enable-rpath-for-build-tools.patch
@@ -1,4 +1,4 @@
-From 31884507eca67a4599c3861bed775e7945ceeea2 Mon Sep 17 00:00:00 2001
+From 2b3b220623dd50228e3b47403a7e07fc73804400 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 17:59:27 +0200
Subject: [PATCH 16/31] Enable rpath for build tools
@@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
INSTALLS += target
--
-2.26.2
+2.28.0
diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch
index 16db9d73c09..1caa3e44319 100644
--- a/0017-Use-system-zlib-for-build-tools.patch
+++ b/0017-Use-system-zlib-for-build-tools.patch
@@ -1,4 +1,4 @@
-From d04842b747381f50c303c5a0b27e15ac2ff87be8 Mon Sep 17 00:00:00 2001
+From 2509527af89dd69120d68c9a6959028a18649996 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:04:42 +0200
Subject: [PATCH 17/31] Use system zlib for build tools
@@ -23,5 +23,5 @@ index c212ccbb6f..1bf9f1e4f9 100644
} else {
CONFIG += no_core_dep
--
-2.26.2
+2.28.0
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch
index ab5028134a9..77d47d8f5e7 100644
--- a/0018-Merge-shared-and-static-library-trees.patch
+++ b/0018-Merge-shared-and-static-library-trees.patch
@@ -1,4 +1,4 @@
-From 10d0bde7bad521e00055177d7165df33b641f539 Mon Sep 17 00:00:00 2001
+From 323393dab8e135dbfbba3e82b164765ac1c82a56 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:45:08 +0200
Subject: [PATCH 18/31] Merge shared and static library trees
@@ -17,10 +17,10 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d
7 files changed, 74 insertions(+), 11 deletions(-)
diff --git a/configure.pri b/configure.pri
-index e775bf046e..8b968ba297 100644
+index 3dedffcace..89938dfc32 100644
--- a/configure.pri
+++ b/configure.pri
-@@ -652,7 +652,12 @@ defineTest(qtConfOutput_machineTuple) {
+@@ -654,7 +654,12 @@ defineTest(qtConfOutput_machineTuple) {
defineTest(qtConfOutput_commitOptions) {
# qdevice.pri needs to be written early, because the compile tests require it.
@@ -34,7 +34,7 @@ index e775bf046e..8b968ba297 100644
}
# type (empty or 'host'), option name, default value
-@@ -1391,3 +1396,12 @@ defineTest(createConfigStatus) {
+@@ -1393,3 +1398,12 @@ defineTest(createConfigStatus) {
QMAKE_POST_CONFIGURE += \
"createConfigStatus()"
@@ -89,10 +89,10 @@ index c15559e174..dd09ac749d 100644
unset(DEVICE_PRI)
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 99b7fe6562..f996e53d2c 100644
+index 69d1954306..2bc7b1dedd 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
-@@ -232,6 +232,23 @@ for(ever) {
+@@ -235,6 +235,23 @@ for(ever) {
!isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
}
@@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
INSTALLS += mkspecs
--
-2.26.2
+2.28.0
diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch
index f7850315bc8..30de2d56d51 100644
--- a/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/0019-Use-.dll.a-as-import-lib-extension.patch
@@ -1,4 +1,4 @@
-From 2ca67ced5786373e565493f78b26d24ee29bf362 Mon Sep 17 00:00:00 2001
+From 366f840385b1e1f575bfb291806d5d0578e195af Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
Subject: [PATCH 19/31] Use *.dll.a as import lib extension
@@ -30,10 +30,10 @@ index 593161f362..37689938eb 100644
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index f996e53d2c..4632cb8b30 100644
+index 2bc7b1dedd..b79b324b88 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
-@@ -213,12 +213,21 @@ for(ever) {
+@@ -216,12 +216,21 @@ for(ever) {
LIBS$$var_sfx += -framework $$framework
} else {
lib = $$MODULE_MODULE$$qtPlatformTargetSuffix()
@@ -59,7 +59,7 @@ index f996e53d2c..4632cb8b30 100644
}
}
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index fb9558055d..ad5086aadd 100644
+index 183cef2908..03732df4a8 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -99,9 +99,13 @@ private:
@@ -94,5 +94,5 @@ index fb9558055d..ad5086aadd 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
-2.26.2
+2.28.0
diff --git a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
index 07b4cac9442..e526054bfaf 100644
--- a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,4 +1,4 @@
-From eecb022d1c1bf16ad8c67d8a21b32a4952bf10f6 Mon Sep 17 00:00:00 2001
+From 62658e138ba05a9c076cad73c6f007dcf4f7d3a7 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:32:00 +0200
Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules
@@ -35,7 +35,7 @@ Change-Id: I75a9c91e9ab0dc06a941b576c28f87aef254669c
2 files changed, 133 insertions(+), 202 deletions(-)
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 309798a767..8b895ff544 100644
+index db18dbece6..5a5bc4d61d 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -52,6 +52,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
@@ -215,9 +215,9 @@ index 309798a767..8b895ff544 100644
-!!ENDIF
+!!ENDIF // !isEmpty(CMAKE_STATIC_TYPE)
- # Add a versionless target, for compatibility with Qt6.
- if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::$${CMAKE_MODULE_NAME})
-@@ -457,6 +483,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+ !!IF !equals(TEMPLATE, aux)
+ !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
+@@ -449,6 +475,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_PLUGIN_TYPES \"$${CMAKE_MODULE_PLUGIN_TYPES}\")
@@ -274,7 +274,7 @@ index 309798a767..8b895ff544 100644
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
-@@ -475,6 +551,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -467,6 +543,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
endif()
endforeach()
@@ -284,7 +284,7 @@ index 309798a767..8b895ff544 100644
set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
)
-@@ -486,6 +565,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -478,6 +557,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
INTERFACE_LINK_LIBRARIES \"Qt5::$${CMAKE_MODULE_NAME}Private\"
)
endif()
@@ -292,7 +292,7 @@ index 309798a767..8b895ff544 100644
endif()
!!IF !equals(TEMPLATE, aux)
-@@ -555,9 +635,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -547,9 +627,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
\"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
!!ENDIF
@@ -306,7 +306,7 @@ index 309798a767..8b895ff544 100644
!!ENDIF // CMAKE_RELEASE_TYPE
!!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
-@@ -568,76 +650,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -560,76 +642,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
)
!!ENDIF // TEMPLATE != aux
@@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644
+endif()
\ No newline at end of file
--
-2.26.2
+2.28.0
diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch
index 17728b58f11..8f3a83e02ff 100644
--- a/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/0021-Allow-usage-of-static-version-with-CMake.patch
@@ -1,4 +1,4 @@
-From 2db997ab2ee436e6e266dc40d0791efa974058a8 Mon Sep 17 00:00:00 2001
+From ea8cf4e19c1f78d2f50ef20d92e89d32311eac7a Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 5 Aug 2017 21:14:26 +0200
Subject: [PATCH 21/31] Allow usage of static version with CMake
@@ -17,10 +17,10 @@ Change-Id: I75f8ff616ad23038416be6271369f9dcc36f2528
.../data/cmake/Qt5BasicConfig.cmake.in | 311 +++++++++++-------
.../data/cmake/Qt5PluginTarget.cmake.in | 32 +-
.../cmake/Qt5StaticOnlyRedirection.cmake.in | 11 +
- src/corelib/Qt5CoreConfigExtras.cmake.in | 24 +-
+ src/corelib/Qt5CoreConfigExtras.cmake.in | 26 +-
src/gui/Qt5GuiConfigExtras.cmake.in | 8 +-
src/testlib/Qt5TestConfigExtras.cmake.in | 2 +-
- 7 files changed, 318 insertions(+), 166 deletions(-)
+ 7 files changed, 319 insertions(+), 167 deletions(-)
create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
@@ -252,7 +252,7 @@ index 37689938eb..636a2af9b6 100644
# We are generating cmake files. Most developers of Qt are not aware of cmake,
# so we require automatic tests to be available. The only module which should
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 8b895ff544..0d33a96821 100644
+index 5a5bc4d61d..97150fb244 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -2,6 +2,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
@@ -604,7 +604,7 @@ index 8b895ff544..0d33a96821 100644
_Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
_Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS
)
-@@ -431,57 +490,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -431,49 +490,60 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endif()
!!IF equals(TEMPLATE, aux)
@@ -627,18 +627,6 @@ index 8b895ff544..0d33a96821 100644
!!ENDIF
!!ENDIF // !isEmpty(CMAKE_STATIC_TYPE)
- # Add a versionless target, for compatibility with Qt6.
-- if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::$${CMAKE_MODULE_NAME})
-- add_library(Qt::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
-- set_target_properties(Qt::$${CMAKE_MODULE_NAME} PROPERTIES
-- INTERFACE_LINK_LIBRARIES \"Qt5::$${CMAKE_MODULE_NAME}\"
-+ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET ${QT_VARIANT_PREFIX}Qt::$${CMAKE_MODULE_NAME})
-+ add_library(${QT_VARIANT_PREFIX}Qt::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
-+ set_target_properties(${QT_VARIANT_PREFIX}Qt::$${CMAKE_MODULE_NAME} PROPERTIES
-+ INTERFACE_LINK_LIBRARIES \"${TARGET_NAME}\"
- )
- endif()
-
!!IF !equals(TEMPLATE, aux)
!!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
@@ -693,7 +681,7 @@ index 8b895ff544..0d33a96821 100644
# Find plugin targets
file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -495,7 +565,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -487,7 +557,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endforeach()
endif()
@@ -705,7 +693,7 @@ index 8b895ff544..0d33a96821 100644
set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -503,7 +577,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -495,7 +569,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
!!ENDIF
@@ -717,7 +705,7 @@ index 8b895ff544..0d33a96821 100644
set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
\"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
)
-@@ -533,17 +611,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -525,17 +603,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endforeach()
endif()
@@ -742,7 +730,7 @@ index 8b895ff544..0d33a96821 100644
)
set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -552,17 +633,18 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -544,17 +625,18 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
endif()
endforeach()
!!IF !isEmpty(CMAKE_STATIC_TYPE)
@@ -768,7 +756,7 @@ index 8b895ff544..0d33a96821 100644
)
endif()
!!ENDIF // CMAKE_STATIC_TYPE
-@@ -570,59 +652,61 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -562,59 +644,61 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!IF !equals(TEMPLATE, aux)
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
@@ -850,7 +838,7 @@ index 8b895ff544..0d33a96821 100644
if (EXISTS
!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -635,7 +719,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -627,7 +711,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ELSE
\"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
!!ENDIF
@@ -859,7 +847,7 @@ index 8b895ff544..0d33a96821 100644
endif()
!!ENDIF // CMAKE_STATIC_TYPE
-@@ -645,18 +729,21 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -637,26 +721,29 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
!!ENDIF // CMAKE_DEBUG_TYPE
!!ELSE // TEMPLATE != aux
@@ -886,6 +874,18 @@ index 8b895ff544..0d33a96821 100644
+ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(\"${CMAKE_CURRENT_LIST_DIR}/../${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\")
+!!ENDIF
endif()
+
+ # Add a versionless target, for compatibility with Qt6.
+-if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND TARGET Qt5::$${CMAKE_MODULE_NAME} AND NOT TARGET Qt::$${CMAKE_MODULE_NAME})
+- add_library(Qt::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
+- set_target_properties(Qt::$${CMAKE_MODULE_NAME} PROPERTIES
+- INTERFACE_LINK_LIBRARIES \"Qt5::$${CMAKE_MODULE_NAME}\"
++if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} AND NOT TARGET ${QT_VARIANT_PREFIX}Qt::$${CMAKE_MODULE_NAME})
++ add_library(${QT_VARIANT_PREFIX}Qt::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED)
++ set_target_properties(${QT_VARIANT_PREFIX}Qt::$${CMAKE_MODULE_NAME} PROPERTIES
++ INTERFACE_LINK_LIBRARIES \"${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}\"
+ )
+ endif()
diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
index acbe1cc33b..65869c5122 100644
--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
@@ -961,7 +961,7 @@ index 0000000000..0091940fd2
+set(OVERRIDE_QT_VARIANT_PREFIX "${ORIGINAL_OVERRIDE_QT_VARIANT_PREFIX}")
+
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index 4c1c3a612b..020b14cc83 100644
+index 0d02edb41c..9da1361c95 100644
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -2,6 +2,8 @@ if(NOT DEFINED QT_DEFAULT_MAJOR_VERSION)
@@ -973,20 +973,24 @@ index 4c1c3a612b..020b14cc83 100644
if (NOT TARGET Qt5::qmake)
add_executable(Qt5::qmake IMPORTED)
-@@ -55,9 +57,9 @@ set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake)
+@@ -55,12 +57,12 @@ set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake)
set(Qt5Core_MOC_EXECUTABLE Qt5::moc)
set(Qt5Core_RCC_EXECUTABLE Qt5::rcc)
-set_property(TARGET Qt5::Core PROPERTY INTERFACE_QT_MAJOR_VERSION 5)
-set_property(TARGET Qt5::Core PROPERTY INTERFACE_QT_COORD_TYPE $$QT_COORD_TYPE)
--set_property(TARGET Qt5::Core APPEND PROPERTY
+set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_QT_MAJOR_VERSION 5)
+set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_QT_COORD_TYPE $$QT_COORD_TYPE)
+ !!IF !isEmpty(CMAKE_MIN_DARWIN_DEPLOYMENT_TARGET)
+-set_property(TARGET Qt5::Core PROPERTY QT_DARWIN_MIN_DEPLOYMENT_TARGET \"$$CMAKE_MIN_DARWIN_DEPLOYMENT_TARGET\")
++set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY QT_DARWIN_MIN_DEPLOYMENT_TARGET \"$$CMAKE_MIN_DARWIN_DEPLOYMENT_TARGET\")
+ !!ENDIF
+-set_property(TARGET Qt5::Core APPEND PROPERTY
+set_property(TARGET ${IMPORTED_TARGET_NAME} APPEND PROPERTY
COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION QT_COORD_TYPE
)
-@@ -68,7 +70,7 @@ foreach(_dir ${_qt5_corelib_extra_includes})
+@@ -71,7 +73,7 @@ foreach(_dir ${_qt5_corelib_extra_includes})
endforeach()
list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_corelib_extra_includes})
@@ -995,7 +999,7 @@ index 4c1c3a612b..020b14cc83 100644
set(_qt5_corelib_extra_includes)
# Targets using Qt need to use the POSITION_INDEPENDENT_CODE property. The
-@@ -83,7 +85,7 @@ set(Qt5_POSITION_INDEPENDENT_CODE True)
+@@ -86,7 +88,7 @@ set(Qt5_POSITION_INDEPENDENT_CODE True)
# Applications now need to be compiled with the -fPIC option if the Qt option
# \"reduce relocations\" is active. For backward compatibility only, Qt accepts
# the use of -fPIE for GCC 4.x versions.
@@ -1004,7 +1008,7 @@ index 4c1c3a612b..020b14cc83 100644
# TODO Qt6: Remove
set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\")
-@@ -91,7 +93,7 @@ set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\")
+@@ -94,7 +96,7 @@ set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\")
!!IF !isEmpty(QT_NAMESPACE)
list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE)
list(APPEND Qt5Core_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE)
@@ -1013,7 +1017,7 @@ index 4c1c3a612b..020b14cc83 100644
!!ENDIF
!!IF !isEmpty(CMAKE_DISABLED_FEATURES)
-@@ -100,9 +102,9 @@ set(Qt5_DISABLED_FEATURES
+@@ -103,9 +105,9 @@ set(Qt5_DISABLED_FEATURES
)
!!ENDIF
@@ -1025,7 +1029,7 @@ index 4c1c3a612b..020b14cc83 100644
!!IF qtConfig(reduce_exports)
set(QT_VISIBILITY_AVAILABLE \"True\")
-@@ -150,14 +152,14 @@ if (NOT TARGET Qt5::WinMain)
+@@ -153,14 +155,14 @@ if (NOT TARGET Qt5::WinMain)
set(_isWin32 $<BOOL:$<TARGET_PROPERTY:WIN32_EXECUTABLE>>)
set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:Qt5_NO_LINK_QTMAIN>>>)
set(_isPolicyNEW $<TARGET_POLICY:CMP0020>)
@@ -1087,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644
INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
)
--
-2.26.2
+2.28.0
diff --git a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
index b062b0c3edd..1931672ccaf 100644
--- a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@@ -1,4 +1,4 @@
-From c43b98b48c09a6a45810f899fc5775542ffb7e1c Mon Sep 17 00:00:00 2001
+From 340f5dd2ffd05d07d7bf66b5092eca5c99cb4737 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 2 Jun 2017 16:42:07 +0200
Subject: [PATCH 22/31] Adjust linker flags for static build with
@@ -13,10 +13,10 @@ Change-Id: Iad665f18da5b4540f0899829a0165e1d3aa4ea60
1 file changed, 6 insertions(+)
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
-index 020b14cc83..fb9d79dc80 100644
+index 9da1361c95..5e802dea4c 100644
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
-@@ -203,3 +203,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain)
+@@ -206,3 +206,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain)
)
endif()
!!ENDIF
@@ -27,5 +27,5 @@ index 020b14cc83..fb9d79dc80 100644
+set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
+unset(_isExe)
--
-2.26.2
+2.28.0
diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch
index e08dbb024ef..e4988af9ef4 100644
--- a/0023-Use-correct-pkg-config-static-flag.patch
+++ b/0023-Use-correct-pkg-config-static-flag.patch
@@ -1,4 +1,4 @@
-From 0da96acd50b724b4b46868f4938c37ea96239a1a Mon Sep 17 00:00:00 2001
+From 5654cdfaf7565e7410e6a005e9083053aa6882b6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:50:21 +0200
Subject: [PATCH 23/31] Use correct pkg-config --static flag
@@ -8,10 +8,10 @@ Subject: [PATCH 23/31] Use correct pkg-config --static flag
1 file changed, 3 insertions(+)
diff --git a/configure.pri b/configure.pri
-index 8b968ba297..f3ebfbc949 100644
+index 89938dfc32..121064e1f8 100644
--- a/configure.pri
+++ b/configure.pri
-@@ -349,6 +349,9 @@ defineTest(qtConfTest_detectPkgConfig) {
+@@ -351,6 +351,9 @@ defineTest(qtConfTest_detectPkgConfig) {
qtLog("Found pkg-config from path: $$pkgConfig")
}
}
@@ -22,5 +22,5 @@ index 8b968ba297..f3ebfbc949 100644
$$qtConfEvaluate("features.cross_compile") {
# cross compiling, check that pkg-config is set up sanely
--
-2.26.2
+2.28.0
diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
index e63010093ab..64053e97126 100644
--- a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,4 +1,4 @@
-From a23f88d109a240c136e19f0dcd15ba0e7aba1804 Mon Sep 17 00:00:00 2001
+From 8394e428ad059d5ba5c647969b6f0e66178ddb53 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 4 Dec 2016 20:35:47 +0100
Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic
@@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
-index 88350cb68b..e1e0aa1125 100644
+index f5766f8775..2403717802 100644
--- a/src/corelib/Qt5CoreMacros.cmake
+++ b/src/corelib/Qt5CoreMacros.cmake
@@ -153,8 +153,9 @@ function(qt5_create_moc_command infile outfile moc_flags moc_options moc_target
@@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644
MAIN_DEPENDENCY ${infile} VERBATIM)
set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
--
-2.26.2
+2.28.0
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch
index 9da5d8f3025..e1fed849db6 100644
--- a/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -1,4 +1,4 @@
-From bd0a5e2d7941e2b4207e2f6759c249b6ac3f32a9 Mon Sep 17 00:00:00 2001
+From ab4f998fa0c472b0f1c3b6ec84e505cfe2b8a94d Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 20:59:54 +0100
Subject: [PATCH 25/31] Ignore errors about missing feature static
@@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644
+ !equals($$1, "static"): error("Could not find feature $${1}.")
}
--
-2.26.2
+2.28.0
diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch
index 68fd04c5c47..95407e46702 100644
--- a/0026-Enable-and-fix-use-of-iconv.patch
+++ b/0026-Enable-and-fix-use-of-iconv.patch
@@ -1,4 +1,4 @@
-From 0bdf8a9c211ff98412fd99d0bf93b00dbd12dc43 Mon Sep 17 00:00:00 2001
+From 6a90a8a3b0d86865419cdd9f6e1a9a581cd8fc9c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:20 +0100
Subject: [PATCH 26/31] Enable and fix use of iconv
@@ -74,5 +74,5 @@ index c5e0423273..0b12e22351 100644
},
"icu": {
--
-2.26.2
+2.28.0
diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch
index 65557157334..a47da0c5b0a 100644
--- a/0027-Ignore-failing-pkg-config-test.patch
+++ b/0027-Ignore-failing-pkg-config-test.patch
@@ -1,4 +1,4 @@
-From c6e55bbd665d7a7693f791884b5ac83594a5e85a Mon Sep 17 00:00:00 2001
+From ba1da244bc63546bf22b7f4be8164c8c63917510 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 21:08:48 +0100
Subject: [PATCH 27/31] Ignore failing pkg-config test
@@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best
1 file changed, 1 deletion(-)
diff --git a/configure.json b/configure.json
-index 8bc5d3dd8a..3b0d8dbd0e 100644
+index bde226843b..653ed122d9 100644
--- a/configure.json
+++ b/configure.json
-@@ -759,7 +759,6 @@
+@@ -770,7 +770,6 @@
"pkg-config": {
"label": "Using pkg-config",
"autoDetect": "!config.darwin && !config.win32",
@@ -21,5 +21,5 @@ index 8bc5d3dd8a..3b0d8dbd0e 100644
"publicFeature",
{ "type": "publicQtConfig", "negative": true },
--
-2.26.2
+2.28.0
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 57997469f14..819fb97a7b2 100644
--- a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,4 +1,4 @@
-From fe0da13a33630cc1684b16c040f2f7c1eb11d775 Mon Sep 17 00:00:00 2001
+From c5a084e56a5c766909c6513e673ec5fbb2fde4c6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 7 Feb 2017 18:25:28 +0100
Subject: [PATCH 28/31] Prevent qmake from messing static lib dependencies
@@ -27,7 +27,7 @@ index f7bd6dc663..b76c444012 100644
int libidx = 0, fwidx = 0;
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index ad5086aadd..a238a6ea33 100644
+index 03732df4a8..602f7609f5 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.cpp
@@ -106,6 +106,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
@@ -41,5 +41,5 @@ index ad5086aadd..a238a6ea33 100644
int libidx = 0;
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
--
-2.26.2
+2.28.0
diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch
index 3a9f60762b4..54d6ba0404a 100644
--- a/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,4 +1,4 @@
-From 532db9dcf2931d1b548a2c0581cd01d07eb00e44 Mon Sep 17 00:00:00 2001
+From 29c9cbb846b7c55894d95ceeffea80ce1485f03e Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 25 Jan 2017 23:42:30 +0100
Subject: [PATCH 29/31] Hardcode linker flags for platform plugins
@@ -9,17 +9,17 @@ libqwindows.dll and libqdirect2d.dll
Change-Id: Ibff901ecce864ae8d5ca2adbe37bcec28e5912f3
---
- src/plugins/platforms/direct2d/direct2d.pro | 30 ++++++++++++++---
- src/plugins/platforms/minimal/minimal.pro | 15 +++++++--
- src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++--
- src/plugins/platforms/windows/windows.pro | 33 +++++++++++++------
- 4 files changed, 73 insertions(+), 19 deletions(-)
+ src/plugins/platforms/direct2d/direct2d.pro | 39 +++++++++++++++---
+ src/plugins/platforms/minimal/minimal.pro | 17 +++++++-
+ src/plugins/platforms/offscreen/offscreen.pro | 16 +++++++-
+ src/plugins/platforms/windows/windows.pro | 40 ++++++++++++++-----
+ 4 files changed, 93 insertions(+), 19 deletions(-)
diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro
-index 6e73bd14f9..e009a5387a 100644
+index 6e73bd14f9..0829c75bd2 100644
--- a/src/plugins/platforms/direct2d/direct2d.pro
+++ b/src/plugins/platforms/direct2d/direct2d.pro
-@@ -1,12 +1,32 @@
+@@ -1,12 +1,41 @@
TARGET = qdirect2d
QT += \
@@ -39,29 +39,38 @@ index 6e73bd14f9..e009a5387a 100644
+ -lfreetype -lole32 -lgdi32 -luuid
+# However, this workaround leads to the necessity of specifying include dirs manually
+INCLUDEPATH += \
++ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION}/QtEventDispatcherSupport \
+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \
++ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}/QtFontDatabaseSupport \
+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} \
++ $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION}/QtThemeSupport \
+ $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION}
+# Same for private support libs for accessibility and vulkan, if those are enabled
+qtConfig(accessibility) {
+ LIBS += $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}Qt5AccessibilitySupport.$${QMAKE_EXTENSION_STATICLIB}
-+ INCLUDEPATH += $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION}
++ INCLUDEPATH += \
++ $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION}/Qt5AccessibilitySupport \
++ $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION}
+}
+qtConfig(vulkan) {
+ LIBS += $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}Qt5VulkanSupport.$${QMAKE_EXTENSION_STATICLIB}
-+ INCLUDEPATH += $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION}
++ INCLUDEPATH += \
++ $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION}/Qt5VulkanSupport \
++ $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION}
+}
+# Also add Qt5WindowsUIAutomationSupport - it seems to link against it
+LIBS += $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}Qt5WindowsUIAutomationSupport.$${QMAKE_EXTENSION_STATICLIB}
-+INCLUDEPATH += $$QT_SOURCE_TREE/include/Qt5WindowsUIAutomationSupport/$${QT_VERSION}
++INCLUDEPATH += \
++ $$QT_SOURCE_TREE/include/Qt5WindowsUIAutomationSupport/$${QT_VERSION}/Qt5WindowsUIAutomationSupport \
++ $$QT_SOURCE_TREE/include/Qt5WindowsUIAutomationSupport/$${QT_VERSION}
LIBS += -ldwmapi -lversion
QMAKE_USE_PRIVATE += gdi32 dwrite_1 d2d1_1 d3d11_1 dxgi1_2
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
-index a1a2da547b..e32225d9b9 100644
+index a1a2da547b..74ced58662 100644
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
-@@ -1,8 +1,19 @@
+@@ -1,8 +1,21 @@
TARGET = qminimal
QT += \
@@ -77,17 +86,19 @@ index a1a2da547b..e32225d9b9 100644
+ -lfreetype -lole32 -lgdi32 -luuid
+# However, this workaround leads to the necessity of specifying include dirs manually
+INCLUDEPATH += \
++ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION}/QtEventDispatcherSupport \
+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \
++ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}/QtFontDatabaseSupport \
+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}
+
DEFINES += QT_NO_FOREACH
diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro
-index f226132592..d8ab86b322 100644
+index f226132592..cac8a007b8 100644
--- a/src/plugins/platforms/offscreen/offscreen.pro
+++ b/src/plugins/platforms/offscreen/offscreen.pro
-@@ -1,8 +1,18 @@
+@@ -1,8 +1,20 @@
TARGET = qoffscreen
QT += \
@@ -103,16 +114,18 @@ index f226132592..d8ab86b322 100644
+ -lfreetype -lole32 -lgdi32 -luuid
+# However, this workaround leads to the necessity of specifying include dirs manually
+INCLUDEPATH += \
++ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION}/QtEventDispatcherSupport \
+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \
++ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}/QtFontDatabaseSupport \
+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}
DEFINES += QT_NO_FOREACH
diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro
-index 50a3bb41a9..285d90c6d3 100644
+index 50a3bb41a9..53c011642f 100644
--- a/src/plugins/platforms/windows/windows.pro
+++ b/src/plugins/platforms/windows/windows.pro
-@@ -1,15 +1,28 @@
+@@ -1,15 +1,35 @@
TARGET = qwindows
-QT += \
@@ -136,21 +149,28 @@ index 50a3bb41a9..285d90c6d3 100644
+ -lfreetype -lole32 -lgdi32 -ldwmapi
+# However, this workaround leads to the necessity of specifying include dirs manually
+INCLUDEPATH += \
++ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION}/QtEventDispatcherSupport \
+ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \
++ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION}/QtFontDatabaseSupport \
+ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} \
++ $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION}/QtThemeSupport \
+ $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION}
+# Same for private support libs for accessibility and vulkan, if those are enabled
+qtConfig(accessibility) {
+ LIBS += $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}Qt5AccessibilitySupport.$${QMAKE_EXTENSION_STATICLIB}
-+ INCLUDEPATH += $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION}
++ INCLUDEPATH += \
++ $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION}/Qt5AccessibilitySupport \
++ $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION}
+}
+qtConfig(vulkan) {
+ LIBS += $$QT_BUILD_TREE/lib/$${QMAKE_PREFIX_STATICLIB}Qt5VulkanSupport.$${QMAKE_EXTENSION_STATICLIB}
-+ INCLUDEPATH += $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION}
++ INCLUDEPATH += \
++ $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION}/Qt5VulkanSupport \
++ $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION}
+}
include(windows.pri)
--
-2.26.2
+2.28.0
diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch
index 4c3e9e3d788..88595eea8e0 100644
--- a/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/0030-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,4 +1,4 @@
-From 9cc80f62ffaec0261b0d554f80ff1413aa46d4d7 Mon Sep 17 00:00:00 2001
+From ed933add3678150e845c63523cee9c09f02538fd Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 25 Aug 2017 17:07:17 +0200
Subject: [PATCH 30/31] Fix linking against static plugins with qmake
@@ -11,7 +11,7 @@ approach
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 4632cb8b30..7583943bd0 100644
+index b79b324b88..6a03b7a74b 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d
@@ -23,7 +23,7 @@ index 4632cb8b30..7583943bd0 100644
manualplugs = $$QTPLUGIN # User may specify plugins. Mostly legacy.
autoplugs = # Auto-added plugins.
# First round: explicitly specified modules.
-@@ -139,7 +139,7 @@ import_plugins:qtConfig(static) {
+@@ -142,7 +142,7 @@ import_plugins:qtConfig(static) {
}
# Only link against plugins in static builds
@@ -33,5 +33,5 @@ index 4632cb8b30..7583943bd0 100644
# Check if the plugin is known to Qt. We can use this to determine
# the plugin path. Unknown plugins must rely on the default link path.
--
-2.26.2
+2.28.0
diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
index 69d999ba823..6e3084dd75a 100644
--- a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@@ -1,4 +1,4 @@
-From 7945a6439915939c437af09c2c1241dc0d28db9d Mon Sep 17 00:00:00 2001
+From e6dce973da0d16d725107c4c8b78ec3f4134b056 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 24 Jun 2019 13:51:02 +0200
Subject: [PATCH 31/31] Prevent 'Cannot find feature windows_vulkan_sdk'
@@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644
LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
for (nu, LD_USES) {
--
-2.26.2
+2.28.0
diff --git a/PKGBUILD b/PKGBUILD
index c66181ffa2d..97538483fcf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,11 +9,15 @@
# All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
# you also find the URL of a binary repository.
+# This file is created from PKGBUILD.sh.ep contained by the mentioned repository.
+# Do not edit it manually! See README.md in the repository's root directory
+# for more information.
+
# All patches are managed at https://github.com/Martchus/qtbase
_qt_module=qtbase
pkgname=mingw-w64-qt5-base
-pkgver=5.15.0
+pkgver=5.15.1
pkgrel=1
pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
arch=('i686' 'x86_64')
@@ -62,38 +66,38 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
'0029-Hardcode-linker-flags-for-platform-plugins.patch'
'0030-Fix-linking-against-static-plugins-with-qmake.patch'
'0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch')
-sha256sums=('9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5'
- '03fbaa97d7e867db4f73c36045010c915d69e14d8de82fba886db6dbb5f2c19a'
- '25a28f49c2403fd7352736e29bcd25b7fcfb761b469515f773e782f2bdee7535'
- 'd0d83f1ef804f0012bea97f1f2c838d650a50556ec1635d5adbf6c8c155abd7e'
- '288ee263514ac6bab04245f3f3403511225a4d135a8db290777f68a91072b9ca'
- '1a25dc976dcd763edb2ca9431083b88b3f4d075104dfbc4aa84ab3ce6e009896'
- '0e81316237392605a09fba67c4fc8d0c596f1b2306b4a5de56e2fc857ef270eb'
- '1371046f24787eb1b7cb7779d5b5f792dd0e96c01fb83abea53dc1d7a3671409'
- 'be86f463255a0a146d80ff6d12d3faf9abca6eb65a8a2ce1cba1e9a27d24aad4'
- '6fd65bf739e9c27e837e73bcb5c203d1d6692e551b05f285f9205fa3818652ec'
- '42c7c59dd5b0d30659c72ff6405a931bdc286278cac4d197da67f565e4b42ba7'
- 'a146c63f13af1ab095ce0d7709e61a96a595c74715f98d6370ad4a42e2361466'
- '68ca7b583d40b8eaf6f3f022256f26e041a5e845c435c17a1462d2a825901f62'
- '9ea635d6aed7d9af8eae17282dcf4e40b9259d03a7afd3af3d9f62e85abda65d'
- '11112caf945e199bca20d1adad09990e348d078fd99567be037fd02ef5081174'
- '39e3fec01c9e823c16219b289babdc8c5af597cfe5496b681f4acc960de2dadb'
- '1b1bed9052a0f7666bbfd99d0a2e21e146e5b24d1967b80367ab0df55c3f3474'
- '896360b605d5b47db2c8459c620a1c07a5951efa702734c58dfb773396dc328b'
- 'd339e29673f2ec6f3ae7c4b6f64188b0686946b0ad5a99c6721fa99dc123bb70'
- '0ac665c9c982be0b35d249bec3e38b8d95c8539a9e68379216994e01f32daaff'
- '8aceb87b3ec8a77bec3f0826dd81325447acdeff4e7179d464f1d1440f867e9e'
- 'fc65b1578af0e6f7883b1f7769d6b333f48bf2d9aa4c2c6423db24237079473f'
- '8c13620f2b35e3b9abc772cef2bf28d1873e3a230c49f19eed1fd305903825c7'
- '227fd12bda01bd023c5f353b3b3c42bc8b14dbd3fd0fc7e78b0ee5fe16017b26'
- 'a63e76c896c2fafef4f457b95d547631d86845d2bb6d414a64d0ffa391dd21ef'
- 'a80a47c4d40e61431cf0357ab14d1634eadec9add509c995e7ff4ee417bd2065'
- '563169bc4886659f026ab35f92175828265385fbfebce44b23565f7de35a1420'
- 'a90671b2188cd76e9d950793d4d41cf2ec54d8f4d3adbc1d966efafc313d2b3a'
- '25a6eabbd5ae5b2f3b86ec36b0d6a298cc9f3df5dd3190abcbd24f54d662da9c'
- 'd69836ba35570985c271ce84a4c6833f33436696e8e25ecb23e27f3e498aa696'
- '3b5ea2572e65c52ff988a97e988f7f4a36a20973c63afb047db6d8a2b67a2dc5'
- 'c8181d71a5209983e4659c1bb11957fb0199e0c7e66808e5cb877e5876c704be')
+sha256sums=('33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c'
+ 'fec4ca039859f9cc9685b34a7bd2da9e0fe24b5b1f85d7cd12665631fa797b44'
+ 'a0ea35e6eef4fed06360efa05e11b898f6033d893e1f1657a240cc03e43f076e'
+ 'cda13b2856fafe92b1369d6f2d01bd4d9bbdb0ec96c25e91e48ba25267c74c6c'
+ 'e13cd18ad781512862b5d288a53ebd09dc0e8bcc6fd3c4e833d0c593f28edd3a'
+ '273af9db2954c1d62e29d2a8328bbfa918bae617456aff6645df4bfb72796e0d'
+ '84a801d904fe308a56a9112af9aa73656eacf36ed7684449363281bfe4108543'
+ '190795aa778ae4e7bd8a74ce56504c697435129b73d2f0418511a4a230f68bc5'
+ '3fff6151dcf76bed12864dba51e4d04d39f8b3969c502a71ed547b527b310d7a'
+ '56240f509157a04ba1f1a23b0e058c2212d66e34aca68a688c15f5d8804bf174'
+ '02ca3a112f3e35749c141ed9c7e87a1fd0e82aa852541024b85f40a99d24d9fc'
+ '3b4dcce669d359953603257e621e6ebc30fb88f0f1c48b35ec443c574f2b05e8'
+ 'ba302124391aea5438e82195dd276edd8942f04cff7c6b85a9f0a5279749566b'
+ '68b5f9e0535c8d030161e67a0e8ee8bec2a80a9c8f69c09a4ad25fe98eb9dfd2'
+ 'ab46b53eb6272185a05d11820317db421be6e4440166967911e7d59d4f0a03d4'
+ 'c11a14a02e48e39e8212097915aed2347825a33022d367f322e34f3aaaf33f90'
+ '6d7c8fd7a162174355dd12399bd8f47f470557751dc117271c02e2e7b385d424'
+ '3c28f5658e0f960091c1991586167ee06bcecd8d843123fbf37ab78a1f5f30f0'
+ 'f9545474bd73be049dbf84fc2ff455e924e6fb29bb807809c384bf56a0227ad6'
+ '2998069e3a427c940f496d75df4cea05acb10d3e82c333a5c957e37f0543a0e8'
+ 'a301ddcd46b9b2fb58d592af88ac6acf81b2dbd328fb8c4c3ef49abffe343267'
+ '3d1257390ff151365d7fa29cde5f9c118310fe727243fb6f50ad30ab117c3384'
+ '19534087d5fc4b434859d68476ebd0647fdc04bf78f24943b7ab88cccf09b08a'
+ '5a57c66303d4a898dd5cccd9c639f367b50b508256fdf9c00ba5179bb00d701c'
+ '84b9e41b7320834a73edf1d192e511801feb51cd2de60ecc28e46982cd572df4'
+ '85bba2428090518dca878ca117299b065913f125c00cede57b31d37a02d0b787'
+ 'f0429a442805c2e0181e8b3b7814259586fdcba000bf324c0e367858c351f6b1'
+ 'c8479468cfb4a70fe65a1317f3fbacd40dcdc7a8bafc88648160509ee8b216e8'
+ 'a2eb9e683b12efe7fbb365749bdd5373e0fbf6438fe5342effab93f3a262d808'
+ '4c097460c443ec0ca47a41ea1ad6fdaa08e394b7a883d54da69bf9557ccbea31'
+ 'e1f2b8bfe9f3cdacceb6d9b73573ad39ea73ac0fce74448c7df0262b34b703bb'
+ '553c15e8cf230c3d3f3fa4c4a7a5a46d18027a4d6c7493f3eab56ca97bd906d9')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index b9c7429a5dc..aec9cc6e043 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5
+33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c