diff options
| author | Martchus | 2020-06-01 19:54:20 +0200 |
|---|---|---|
| committer | Martchus | 2020-06-01 19:54:20 +0200 |
| commit | e06a2fdf55f17fd795b56df7be0e5944b870a5e7 (patch) | |
| tree | 3c2c94ae17f73d637f8930b97f3069aae9733ede | |
| parent | 9489b8b77c533db3288118bc003d190456bf79ff (diff) | |
| download | aur-e06a2fdf55f17fd795b56df7be0e5944b870a5e7.tar.gz | |
Update to 5.15.0
34 files changed, 396 insertions, 340 deletions
@@ -1,7 +1,7 @@ pkgbase = mingw-w64-qt5-base-static pkgdesc = A cross-platform application and UI framework, native OpenGL backend (mingw-w64) - pkgver = 5.14.2 - pkgrel = 2 + pkgver = 5.15.0 + pkgrel = 1 url = https://www.qt.io/ arch = any groups = mingw-w64-qt5 @@ -32,7 +32,7 @@ pkgbase = mingw-w64-qt5-base-static options = !buildflags options = staticlibs options = !emptydirs - source = https://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz + source = https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.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-static 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 = 48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a - sha256sums = 14affce3bf8d6a2d2682e0cc7113a62fe851a62fcd5a76539acfe1f4b0c9ea4b - sha256sums = 96d750723b2e44fdb78520ebb369111391850554b55a4cb1c0a57299b97579fd - sha256sums = 4daa7399d1b8523cdf1446e2e4e3cefeaf8a1b14a467f808c3fda9e8e8516965 - sha256sums = ef4d333e7f0aa5bcfe1b4f67bf687f5ea2c9698189a0d001080783829c1b85bf - sha256sums = 54fcf347fe0355306b7ba122ff461c1153919908f89b1306ea50f4f8cf8c69f0 - sha256sums = e55dc7743472c72e58bf0ae780ca0a029670f075538a5c7c5658fe6742476985 - sha256sums = a5f5a87fc80182aeff9ea463c675243b91da432e02d0ca1e8d3b6f9f77013e4b - sha256sums = 1fbf437012eca9276178180a2cb15b6b0296553ca9304ae258b1cce6aed15bc0 - sha256sums = 9a1d2f0f2059beeb70236e2f7ecbb2ef15e50644cb6a909a125306f067b3293f - sha256sums = 701bff16f7ad0809dbb61806c050d0742df10e125c24a841db8712e6146d6235 - sha256sums = dfba051c3fec6a77bcd07ebcd4d5e077d7b6fc7ae5291d0680820ac0cc320f2d - sha256sums = 8cc25ac98e8bff73fc980e4afc9e774569218145d2123808e14fe5d8649fe0d0 - sha256sums = 8c0709d32c38a226116126ecf4d7fc71944fe3d6a42b8b5a27351e824ed445eb - sha256sums = dfd12ab7e72b9721d16f902e97fe1c3379d20ae52633610c56d10bcb5e294395 - sha256sums = 66c4cf8d218ee5582d6cf8836ed9916502e6ac5d4b77c46ee122460bb98f515d - sha256sums = a5667634a5940620ca71cdc77c6e1ab656891c308d5053c25736e994ea4c78e0 - sha256sums = d82a344682f1290dfbc174ccdf35bbdeb4cf9f5418d3bfc664491451bb7a8229 - sha256sums = d10bbf540f58388557e5f39c447cff09ff1ddb733ea18f3d8678a308c478dbec - sha256sums = 8691b0a628c04e624d8d98680cb54814a46cd9af67168155a1c46bc9ecd5eafe - sha256sums = a75a275232484eb616942731052552764348654b413225a334082635558def39 - sha256sums = 4b8ceafdf29b045bcc3633c3b2f5682f925b9c79a73c738336e8c795201cbca0 - sha256sums = 065ffac8cc7835f941fbbf355aa1ba63c1203c0491672ce7f99576198c0ee3eb - sha256sums = 567f9e136382f7373fd898d7699acc198767d2d5fa93375391826125aa7f7196 - sha256sums = 389697028d0a704caffa06e47d70d9c2c3cd852616d5a4cad6e6482d5e3e7ff2 - sha256sums = 90898fd84a95b03298d1eaa136459cd65b50957593e1e02a0c02be660097ddb1 - sha256sums = a4681e107f97cc802c1dc975c3118c492256e7baf398598061c7ae5ed3e1d65e - sha256sums = e22cb9b06d182145433f4bbf7200273a009d62676570f476268ab8db2c23e36b - sha256sums = eb409f1146c39f19d43fe71c103f40ec6c37d0760cae333f05146ca7e61b47b2 - sha256sums = 8ee993247e7240947e5e8a549407ebbda2fa9e73c8310b41caff7da767012a6c - sha256sums = 03cb0da4cfe2315c4d8fc845e6a758f3ef6fc51883f993b3bf600653ab342579 - sha256sums = 745e15a29bea515c0d65ddad01851e06c8ece5f1f18a0df871f09d5db55057fb + 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 pkgname = mingw-w64-qt5-base-static 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 b5a122337212..3f2da7e287fe 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,11 +1,11 @@ -From c416378bd70ab26f9ce9e34fe72a364dd19bae73 Mon Sep 17 00:00:00 2001 +From c06d6c088bb5bd20ef531f38beb9f5eb8b2f8045 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 mingw-w64 Adding a new, separate mkspec instead of patching the existing one -might be the cleaner solution. However tools like windeployqt and +might be the cleaner solution. However, tools like windeployqt and qbs do checks based on the hardcoded mkspec name to detect MinGW. So for this to work, the mkspec must be called win32-g++. @@ -13,15 +13,15 @@ Also see the following issues: * https://github.com/Martchus/PKGBUILDs/issues/59 * https://github.com/Martchus/PKGBUILDs/issues/60 -Change-Id: I4c9b3c170ed13943abe0d8b397a8cb9e360538b6 +Change-Id: I127bb0516bd4acfea588a5d48c46811525a8fca8 --- - mkspecs/common/g++-win32.conf | 52 ++++++++++++++++++++---------- + mkspecs/common/g++-win32.conf | 50 ++++++++++++++++++++---------- mkspecs/win32-clang-g++/qmake.conf | 4 +-- mkspecs/win32-g++/qmake.conf | 4 +-- - 3 files changed, 39 insertions(+), 21 deletions(-) + 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index c3a1f3a373..5208d22bd6 100644 +index c3a1f3a373..d852ccc2ad 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -8,18 +8,24 @@ @@ -60,7 +60,7 @@ index c3a1f3a373..5208d22bd6 100644 QMAKE_INCDIR = -@@ -41,40 +48,51 @@ QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src +@@ -41,40 +48,49 @@ QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads @@ -93,12 +93,10 @@ index c3a1f3a373..5208d22bd6 100644 -QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -QMAKE_LIBS_NETWORK = -lws2_32 +QMAKE_LIBS_CORE = -lz -lpcre2-16 -liconv -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -+QMAKE_LIBS_GUI = -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \ -+ $$system($${QMAKE_PKG_CONFIG} --libs harfbuzz) \ -+ $$system($${QMAKE_PKG_CONFIG} --libs freetype2) -+QMAKE_LIBS_GUI_STATIC = -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \ -+ $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \ -+ $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2) ++QMAKE_LIBS_GUI = $$system($${QMAKE_PKG_CONFIG} --libs harfbuzz) $$system($${QMAKE_PKG_CONFIG} --libs freetype2) \ ++ -ljpeg -lpng -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 ++QMAKE_LIBS_GUI_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2) \ ++ -ljpeg -lpng -lopengl32 -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ldxgi -ld3d11 +QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi -liphlpapi +QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -lws2_32 -lcrypt32 -ldnsapi -liphlpapi +QMAKE_LIBS_DBUS = $$system($${QMAKE_PKG_CONFIG} --libs dbus-1) @@ -163,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.26.1 +2.26.2 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 db2a1648616b..d7243c6b82f4 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 06380a45c2cb2f6882e7102fdd46bcdd9e4aba48 Mon Sep 17 00:00:00 2001 +From d87ff34ab62714aa4aaf77788285b2d00eaa42dc 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.1 +2.26.2 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 4e6a494c5d00..d0b63b27f1c1 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 40b1ebaa7481c339b437e976e760bf099df5c594 Mon Sep 17 00:00:00 2001 +From fdbae98369593e87e93fe093944804fcf3ca532f 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.1 +2.26.2 diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch index 99ab6bc01aff..4102e8b3db50 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 f1122d1929e271162eb062aad43097ad69c7159e Mon Sep 17 00:00:00 2001 +From 327b095fbcb10ed66342db3d68eeac1322c73124 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 @@ -10,10 +10,10 @@ Subject: [PATCH 04/31] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 7e471f126c..f9532e0db9 100644 +index 5c61a3c65c..e94084381c 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3215,7 +3215,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3211,7 +3211,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index 7e471f126c..f9532e0db9 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3240,7 +3240,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3236,7 +3236,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -36,7 +36,7 @@ index 7e471f126c..f9532e0db9 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index ab970c966f..01f97c61d4 100644 +index a96b9c54da..5a7913be7a 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -96,7 +96,7 @@ protected: @@ -49,7 +49,7 @@ index ab970c966f..01f97c61d4 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 3ec2704625..f33edb5bd9 100644 +index 6cbd20c187..fb9558055d 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 3ec2704625..f33edb5bd9 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.26.1 +2.26.2 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 352316775acf..98cccfe588e3 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 dc9860e99a09a4dc54cfe60959a34e06a288f7d6 Mon Sep 17 00:00:00 2001 +From e255d761b2795b2525a4b94e27b6e77a8fdc2884 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 @@ -24,5 +24,5 @@ index 096b041056..eb498b28e8 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.26.1 +2.26.2 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 909f59542d2d..4721cc1b6ccf 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 2cfd0a32516ba85f0c608fb81341090c28209750 Mon Sep 17 00:00:00 2001 +From dd50dd544fbf94606c08fa57b0393df24282c28b 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 @@ -15,10 +15,10 @@ files for the debug build an unique file name. 1 file changed, 3 insertions(+) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index f9532e0db9..9c65f21ac0 100644 +index e94084381c..8e4d11484f 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3229,6 +3229,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3225,6 +3225,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index f9532e0db9..9c65f21ac0 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.26.1 +2.26.2 diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch index 9015a5289b65..c218ba9766b2 100644 --- a/0007-Fix-linking-against-shared-static-libpng.patch +++ b/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 3e1b4e602c5a2569d9a337990a2e38e3ef82f251 Mon Sep 17 00:00:00 2001 +From 88a8b2b376adccd0cb520095a67bbee4d7044841 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,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 0202f17b21..099c11da95 100644 +index 5ebcdb99b5..bb6bc488e8 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -400,8 +400,10 @@ +@@ -399,8 +399,10 @@ { "type": "pkgConfig", "args": "libpng" }, { "libs": "-llibpng16", "condition": "config.msvc" }, { "libs": "-llibpng", "condition": "config.msvc" }, @@ -26,5 +26,5 @@ index 0202f17b21..099c11da95 100644 ], "use": [ -- -2.26.1 +2.26.2 diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch index 668932dbd6e2..9962a031533f 100644 --- a/0008-Fix-linking-against-static-D-Bus.patch +++ b/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From d54fefe4a033a39ba628858c18ab0a95520069f2 Mon Sep 17 00:00:00 2001 +From ad6970df8b2a43767bc93b3e7cc40f3c41f8051c 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 868f15db13..147cf9eb00 100644 +index d1eb1d8102..dc34ec86c0 100644 --- a/configure.json +++ b/configure.json @@ -188,18 +188,23 @@ @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include <dbus/dbus.h> #else -- -2.26.1 +2.26.2 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 bd9ba672a844..feaaa1813380 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 012e5b2dfbc5de85412bb450970d0320e369da30 Mon Sep 17 00:00:00 2001 +From a2c69570b5c69a8eb5596b9f5d9bc83ca80aec79 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 147cf9eb00..a481e54b8d 100644 +index dc34ec86c0..8bc5d3dd8a 100644 --- a/configure.json +++ b/configure.json @@ -201,7 +201,7 @@ @@ -25,5 +25,5 @@ index 147cf9eb00..a481e54b8d 100644 }, "condition": "config.win32 && features.shared" -- -2.26.1 +2.26.2 diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch index 624928914e4b..9471d57a34a5 100644 --- a/0010-Fix-linking-against-static-freetype2.patch +++ b/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From ca204fd0ed444fdf4e478540f8b5d88cb345be75 Mon Sep 17 00:00:00 2001 +From a9ec56ae29485985bb2a073df3cf8a097c3b4809 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,10 +8,10 @@ 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 099c11da95..872deb3ad3 100644 +index bb6bc488e8..12c1995708 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -239,8 +239,11 @@ +@@ -238,8 +238,11 @@ }, "headers": "ft2build.h", "sources": [ @@ -26,5 +26,5 @@ index 099c11da95..872deb3ad3 100644 { "libs": "-lfreetype" } ], -- -2.26.1 +2.26.2 diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch index cd9b8daa15ad..9c16e90c07d3 100644 --- a/0011-Fix-linking-against-static-harfbuzz.patch +++ b/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From 483ae9b6bfc1f40e3617d8b6cd58ef93985cf397 Mon Sep 17 00:00:00 2001 +From 20070311343c73fc883f64b25246e8659d2f7c1c 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,10 +8,10 @@ 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 872deb3ad3..7daaaa5a11 100644 +index 12c1995708..e7e1728ba4 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -307,7 +307,11 @@ +@@ -306,7 +306,11 @@ }, "headers": "harfbuzz/hb.h", "sources": [ @@ -25,5 +25,5 @@ index 872deb3ad3..7daaaa5a11 100644 }, "imf": { -- -2.26.1 +2.26.2 diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch index 0f21232a9584..a9a63fbbdb89 100644 --- a/0012-Fix-linking-against-static-pcre.patch +++ b/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 0c26bfba6773298fd314fc38ec1be7cb58a5d752 Mon Sep 17 00:00:00 2001 +From 37eca8f75fc47c2709809b053fa7b4858fca7e5c 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 59d21e0a23..518f91d753 100644 +index d74b759aa9..6aca6caaef 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -53,6 +53,10 @@ @@ -24,5 +24,5 @@ index 59d21e0a23..518f91d753 100644 #include <pcre2.h> -- -2.26.1 +2.26.2 diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch index 816899734e86..3dd5c5686eaf 100644 --- a/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 99c6804513dc0dc010fa00108914ff7e865c9ae7 Mon Sep 17 00:00:00 2001 +From aa0918bd2b83d0e9caed77b0bdbe1092edcc8ee9 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 @@ -9,7 +9,7 @@ Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b 1 file changed, 2 insertions(+) diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json -index cd20eef1df..9c8475439f 100644 +index 28ccbeadcd..7262914c64 100644 --- a/src/plugins/sqldrivers/configure.json +++ b/src/plugins/sqldrivers/configure.json @@ -67,6 +67,8 @@ @@ -22,5 +22,5 @@ index cd20eef1df..9c8475439f 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.26.1 +2.26.2 diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 7ca8cfa40005..0fc3c50cdaaa 100644 --- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 718ed1a58165a785123450d2e00ceaef0d1121e5 Mon Sep 17 00:00:00 2001 +From 51188881323e4563e58e6e32b4ac30478c5e56ef 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 @@ -8,10 +8,10 @@ Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json -index 9c8475439f..478c669e88 100644 +index 7262914c64..852ba558be 100644 --- a/src/plugins/sqldrivers/configure.json +++ b/src/plugins/sqldrivers/configure.json -@@ -88,9 +88,9 @@ +@@ -90,9 +90,9 @@ }, "headers": "libpq-fe.h", "sources": [ @@ -24,5 +24,5 @@ index 9c8475439f..478c669e88 100644 ] }, -- -2.26.1 +2.26.2 diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch index a73df5b95464..6cafdb272787 100644 --- a/0015-Rename-qtmain-to-qt5main.patch +++ b/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 1bbc646bd5ceb497aba73d8fc77214bf29d34f48 Mon Sep 17 00:00:00 2001 +From 3d8c9c9a7b35b0d2fa749b272bd57cab188a4834 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 @@ -12,10 +12,10 @@ Prevents conflict with mingw-w64-qt4 package 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 5208d22bd6..1a058b787f 100644 +index d852ccc2ad..11249c1470 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf -@@ -84,7 +84,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 +@@ -82,7 +82,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 @@ -25,10 +25,10 @@ index 5208d22bd6..1a058b787f 100644 QMAKE_IDL = $${CROSS_COMPILE}widl QMAKE_LIB = $${CROSS_COMPILE}ar -rc diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 0e71fd0015..0e8d41c685 100644 +index 24ed125f12..593161f362 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -325,14 +325,14 @@ mac { +@@ -329,14 +329,14 @@ mac { } mingw { @@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.26.1 +2.26.2 diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch index ea291ac331c9..e535f5127a78 100644 --- a/0016-Enable-rpath-for-build-tools.patch +++ b/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From d8faa947bfaa0a4d7e0a4e861904773dd7479938 Mon Sep 17 00:00:00 2001 +From 31884507eca67a4599c3861bed775e7945ceeea2 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.1 +2.26.2 diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch index 3a53f666a2ed..16db9d73c09d 100644 --- a/0017-Use-system-zlib-for-build-tools.patch +++ b/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From cd29a4171cddcae9ad0e6367ea7de43fc6507e02 Mon Sep 17 00:00:00 2001 +From d04842b747381f50c303c5a0b27e15ac2ff87be8 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 @@ -8,10 +8,10 @@ Subject: [PATCH 17/31] Use system zlib for build tools 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro -index 9863ff5e69..02329611bc 100644 +index c212ccbb6f..1bf9f1e4f9 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro -@@ -154,7 +154,9 @@ macx { +@@ -158,7 +158,9 @@ macx { ../../corelib/io/qstandardpaths_win.cpp } @@ -23,5 +23,5 @@ index 9863ff5e69..02329611bc 100644 } else { CONFIG += no_core_dep -- -2.26.1 +2.26.2 diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch index 3f451889201c..ab5028134a9a 100644 --- a/0018-Merge-shared-and-static-library-trees.patch +++ b/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 7cfd69a804680ba04a89bc921f5e35a5add12fd4 Mon Sep 17 00:00:00 2001 +From 10d0bde7bad521e00055177d7165df33b641f539 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 81c84b28ef..910e59188f 100644 +index e775bf046e..8b968ba297 100644 --- a/configure.pri +++ b/configure.pri -@@ -648,7 +648,12 @@ defineTest(qtConfOutput_machineTuple) { +@@ -652,7 +652,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 81c84b28ef..910e59188f 100644 } # type (empty or 'host'), option name, default value -@@ -1387,3 +1392,12 @@ defineTest(createConfigStatus) { +@@ -1391,3 +1396,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -89,7 +89,7 @@ index c15559e174..dd09ac749d 100644 unset(DEVICE_PRI) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 3a71376029..bbada46c29 100644 +index 99b7fe6562..f996e53d2c 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -232,6 +232,23 @@ for(ever) { @@ -139,10 +139,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 9c65f21ac0..f79512ca60 100644 +index 8e4d11484f..c73b19c144 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3232,6 +3232,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3228,6 +3228,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -152,7 +152,7 @@ index 9c65f21ac0..f79512ca60 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3408,11 +3411,11 @@ MakefileGenerator::writePkgConfigFile() +@@ -3404,11 +3407,11 @@ MakefileGenerator::writePkgConfigFile() t << Qt::endl; // requires @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.26.1 +2.26.2 diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch index 4e1a75859f70..f7850315bc8f 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 6d6041eed5ab64b15648c60a378a46976481161c Mon Sep 17 00:00:00 2001 +From 2ca67ced5786373e565493f78b26d24ee29bf362 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 @@ -14,10 +14,10 @@ Change-Id: I40acb56685628ed52b3e6b89aab7f53f9a872b1a 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 0e8d41c685..a94f443de6 100644 +index 593161f362..37689938eb 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -328,8 +328,9 @@ mac { +@@ -332,8 +332,9 @@ mac { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a @@ -30,7 +30,7 @@ index 0e8d41c685..a94f443de6 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 bbada46c29..d6299d8eed 100644 +index f996e53d2c..4632cb8b30 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -213,12 +213,21 @@ for(ever) { @@ -59,7 +59,7 @@ index bbada46c29..d6299d8eed 100644 } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index f33edb5bd9..3a75986257 100644 +index fb9558055d..ad5086aadd 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -99,9 +99,13 @@ private: @@ -94,5 +94,5 @@ index f33edb5bd9..3a75986257 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.26.1 +2.26.2 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 c61c9ddcd2be..07b4cac94422 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 13269a57b3bd20b86c50d0bd8b4e9fb2dc771601 Mon Sep 17 00:00:00 2001 +From eecb022d1c1bf16ad8c67d8a21b32a4952bf10f6 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 @@ -13,10 +13,11 @@ patch provides: 1. Take dependencies of static plugins into account as well 2. Create imported targets for the dependencies to prevent - problems with -Wl,-Bstatic and -Wl,-Bdynamic + CMake from adding wrong `-Wl,-Bstatic` and `-Wl,-Bdynamic` + linker flags -Note that this patch has been harmonized with official changes, -e.g. to use QMAKE_PRL_LIBS instead of QMAKE_PRL_LIBS_FOR_CMAKE. +This patch has been harmonized with official changes, e.g. to +use QMAKE_PRL_LIBS instead of QMAKE_PRL_LIBS_FOR_CMAKE. See https://github.com/Martchus/PKGBUILDs/issues/86#issuecomment-476840055 for further details on 2. @@ -24,20 +25,20 @@ for further details on 2. With Qt 5.14.0 the support for using static libraries seems to be further improved. I had not time to test whether it actually works so I keep using my own implemention for now. -That's why this patch now removes a lot of the 5.14.0 additions -in favour of 'how it used to work'. +That's why this patch now removes a lot of the 5.14.0 and 5.15.0 +additions in favour of 'how it used to work'. -Change-Id: I6566d42d7e27d4cd23d261a0eacca9efad9ce6df +Change-Id: I75a9c91e9ab0dc06a941b576c28f87aef254669c --- - .../data/cmake/Qt5BasicConfig.cmake.in | 241 ++++++++++-------- - .../data/cmake/Qt5PluginTarget.cmake.in | 84 +----- - 2 files changed, 135 insertions(+), 190 deletions(-) + .../data/cmake/Qt5BasicConfig.cmake.in | 242 +++++++++--------- + .../data/cmake/Qt5PluginTarget.cmake.in | 93 +------ + 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 1099a761ce..a82e6a886f 100644 +index 309798a767..8b895ff544 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -53,6 +53,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura +@@ -52,6 +52,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura set(_lib_deps) set(_link_flags) @@ -48,7 +49,7 @@ index 1099a761ce..a82e6a886f 100644 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\") !!ELSE -@@ -61,6 +65,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura +@@ -60,6 +64,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura if(EXISTS \"${prl_file_location}\") file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\") @@ -59,7 +60,7 @@ index 1099a761ce..a82e6a886f 100644 # file(STRINGS) replaces all semicolons read from the file with backslash semicolons. # We need to do a reverse transformation in CMake. For that we replace all backslash -@@ -92,7 +100,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura +@@ -91,7 +99,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura # Handle normal libraries passed as -lfoo set(_lib \"${CMAKE_MATCH_1}\") foreach(_standard_library ${_standard_libraries}) @@ -68,7 +69,7 @@ index 1099a761ce..a82e6a886f 100644 set(_lib_is_default_linked TRUE) break() endif() -@@ -139,6 +147,37 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura +@@ -138,6 +146,37 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura set(${lib_deps} ${_lib_deps} PARENT_SCOPE) set(${link_flags} \"SHELL:${_link_flags}\" PARENT_SCOPE) endfunction() @@ -106,11 +107,8 @@ index 1099a761ce..a82e6a886f 100644 !!ENDIF !!IF !equals(TEMPLATE, aux) -@@ -152,61 +191,39 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF +@@ -153,59 +192,36 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) -+ set(_deps ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} - ) @@ -186,7 +184,7 @@ index 1099a761ce..a82e6a886f 100644 !!ENDIF !!IF !isEmpty(CMAKE_WINDOWS_BUILD) -@@ -223,6 +240,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -222,6 +238,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI endif() !!ENDIF endmacro() @@ -202,10 +200,10 @@ index 1099a761ce..a82e6a886f 100644 !!ENDIF if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) -@@ -408,13 +434,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - +@@ -411,13 +436,14 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") + !!ENDIF -!!ELSE + +!!ELSE // !isEmpty(CMAKE_STATIC_TYPE) @@ -216,11 +214,10 @@ index 1099a761ce..a82e6a886f 100644 !!ENDIF -!!ENDIF +!!ENDIF // !isEmpty(CMAKE_STATIC_TYPE) -+ - !!IF !equals(TEMPLATE, aux) - !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1) -@@ -431,6 +459,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + + # 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}) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_PLUGIN_TYPES \"$${CMAKE_MODULE_PLUGIN_TYPES}\") @@ -277,7 +274,7 @@ index 1099a761ce..a82e6a886f 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}) -@@ -449,9 +527,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -475,6 +551,9 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) endif() endforeach() @@ -287,11 +284,15 @@ index 1099a761ce..a82e6a886f 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}) + INTERFACE_LINK_LIBRARIES \"Qt5::$${CMAKE_MODULE_NAME}Private\" + ) + endif() +!!ENDIF // CMAKE_STATIC_TYPE endif() !!IF !equals(TEMPLATE, aux) -@@ -521,9 +603,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -555,9 +635,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF @@ -305,13 +306,18 @@ index 1099a761ce..a82e6a886f 100644 !!ENDIF // CMAKE_RELEASE_TYPE !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -534,73 +618,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -568,76 +650,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) !!ENDIF // TEMPLATE != aux -!!IF isEmpty(CMAKE_INTERNAL_MODULE) -- -- file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") +- # In Qt 5.15 the glob pattern was relaxed to also catch plugins not literally named "Plugin". +- # Define QT5_STRICT_PLUGIN_GLOB or ModuleName_STRICT_PLUGIN_GLOB to revert to old behavior. +- if (QT5_STRICT_PLUGIN_GLOB OR Qt5$${CMAKE_MODULE_NAME}_STRICT_PLUGIN_GLOB) +- file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") +- else() +- file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*.cmake\") +- endif() - - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION - IsDebugAndRelease) @@ -372,15 +378,13 @@ index 1099a761ce..a82e6a886f 100644 - include(${pluginTarget}) - endforeach() - endif() -- -!!ENDIF // isEmpty(CMAKE_INTERNAL_MODULE) - -- !!IF !isEmpty(CMAKE_MODULE_EXTRAS) include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\") !!ENDIF diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -index 7b70cfed09..25f2162fe6 100644 +index b550a52c60..acbe1cc33b 100644 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in @@ -1,5 +1,6 @@ @@ -392,7 +396,7 @@ index 7b70cfed09..25f2162fe6 100644 !!IF !isEmpty(CMAKE_STATIC_TYPE) set(_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_PLUGIN_MODULE_DEPS}\") -@@ -16,87 +17,14 @@ foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES}) +@@ -16,99 +17,17 @@ foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES}) endforeach() !!IF !isEmpty(CMAKE_RELEASE_TYPE) @@ -408,10 +412,11 @@ index 7b70cfed09..25f2162fe6 100644 - _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES - _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_RELEASE_LINK_FLAGS -) --!!ENDIF --!!ENDIF -- --!!IF !isEmpty(CMAKE_DEBUG_TYPE) ++ _populate_$${CMAKE_MODULE_NAME}_plugin_properties(Qt5::$$CMAKE_MODULE_NAME Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") + !!ENDIF + !!ENDIF + + !!IF !isEmpty(CMAKE_DEBUG_TYPE) -!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -_qt5_$${CMAKE_MODULE_NAME}_process_prl_file( - \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG @@ -425,24 +430,23 @@ index 7b70cfed09..25f2162fe6 100644 - _Qt5$${CMAKE_PLUGIN_NAME}_STATIC_DEBUG_LINK_FLAGS -) -!!ENDIF -+ _populate_$${CMAKE_MODULE_NAME}_plugin_properties(Qt5::$$CMAKE_MODULE_NAME Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\") - !!ENDIF +-!!ENDIF - -set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES - \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_$${CMAKE_PLUGIN_NAME}_Import.cpp\" -) - !!ENDIF - +-!!ENDIF +- -!!IF !isEmpty(CMAKE_RELEASE_TYPE) -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF - !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-!!IF !isEmpty(CMAKE_DEBUG_TYPE) -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) + _populate_$${CMAKE_MODULE_NAME}_plugin_properties(Qt5::$$CMAKE_MODULE_NAME Qt5::$$CMAKE_PLUGIN_NAME $$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\") !!ENDIF list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) --set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY QT_ALL_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED} Qt5::$${CMAKE_PLUGIN_NAME}) + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY QT_ALL_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED} Qt5::$${CMAKE_PLUGIN_NAME}) -!!IF !isEmpty(CMAKE_STATIC_TYPE) -# $<GENEX_EVAL:...> wasn\'t added until CMake 3.12, so put a version guard around it -if(CMAKE_VERSION VERSION_LESS \"3.12\") @@ -453,24 +457,34 @@ index 7b70cfed09..25f2162fe6 100644 - set(_manual_plugins_genex \"$<GENEX_EVAL:$<TARGET_PROPERTY:QT_PLUGINS>>\") - set(_plugin_type_genex \"$<GENEX_EVAL:$<TARGET_PROPERTY:QT_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED}>>\") - set(_no_plugins_genex \"$<GENEX_EVAL:$<TARGET_PROPERTY:QT_NO_PLUGINS>>\") -+ - endif() +-endif() -set(_user_specified_genex - \"$<IN_LIST:Qt5::$$CMAKE_PLUGIN_NAME,${_manual_plugins_genex};${_plugin_type_genex}>\" -) +-set(_user_specified_genex_versionless +- \"$<IN_LIST:Qt::$$CMAKE_PLUGIN_NAME,${_manual_plugins_genex};${_plugin_type_genex}>\" +-) -string(CONCAT _plugin_genex - \"$<$<OR:\" -- # Add this plugin if it\'s in the list of manual plugins or plugins for the type +- # Add this plugin if it\'s in the list of manually specified plugins or in the list of +- # explicitly included plugin types. - \"${_user_specified_genex},\" -- # Add this plugin if the list of plugins for the type is empty, the PLUGIN_EXTENDS -- # is either empty or equal to the module name, and the user hasn\'t blacklisted it +- \"${_user_specified_genex_versionless},\" +- # Add this plugin if all of the following are true: +- # 1) the list of explicitly included plugin types is empty +- # 2) the QT_PLUGIN_EXTENDS property for the plugin is empty or equal to the current +- # module name +- # 3) the user hasn\'t explicitly excluded the plugin. - \"$<AND:\" - \"$<STREQUAL:${_plugin_type_genex},>,\" - \"$<OR:\" -- \"$<STREQUAL:$<TARGET_PROPERTY:Qt5::$${CMAKE_PLUGIN_NAME},QT_PLUGIN_EXTENDS>,Qt5::$${CMAKE_MODULE_NAME}>,\" +- # FIXME: The value of CMAKE_MODULE_NAME seems to be wrong (e.g for Svg plugin +- # it should be Qt::Svg instead of Qt::Gui). +- \"$<STREQUAL:$<TARGET_PROPERTY:Qt5::$${CMAKE_PLUGIN_NAME},QT_PLUGIN_EXTENDS>,Qt::$${CMAKE_MODULE_NAME}>,\" - \"$<STREQUAL:$<TARGET_PROPERTY:Qt5::$${CMAKE_PLUGIN_NAME},QT_PLUGIN_EXTENDS>,>\" - \">,\" -- \"$<NOT:$<IN_LIST:Qt5::$${CMAKE_PLUGIN_NAME},${_no_plugins_genex}>>\" +- \"$<NOT:$<IN_LIST:Qt5::$${CMAKE_PLUGIN_NAME},${_no_plugins_genex}>>,\" +- \"$<NOT:$<IN_LIST:Qt::$${CMAKE_PLUGIN_NAME},${_no_plugins_genex}>>\" - \">\" - \">:Qt5::$$CMAKE_PLUGIN_NAME>\" -) @@ -481,8 +495,11 @@ index 7b70cfed09..25f2162fe6 100644 - \"$${CMAKE_PLUGIN_QT5_MODULE_DEPS}\" -) -!!ENDIF --set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\") --set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\") + set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\") + set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\") + set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\") ++endif() +\ No newline at end of file -- -2.26.1 +2.26.2 diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch index 54261171380d..17728b58f11e 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 3401a7615a3a3639a5fd9568e1d5f594952462ea Mon Sep 17 00:00:00 2001 +From 2db997ab2ee436e6e266dc40d0791efa974058a8 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 @@ -11,20 +11,20 @@ installed in the same prefix - Set USE_STATIC_QT_BY_DEFAULT to use static version via regular find_package(Qt5Core) -Change-Id: I339c8ef3a6ab96a3a6b85f7c8b93f1a5ee38cd71 +Change-Id: I75f8ff616ad23038416be6271369f9dcc36f2528 --- mkspecs/features/create_cmake.prf | 96 ++++-- - .../data/cmake/Qt5BasicConfig.cmake.in | 304 ++++++++++++------ - .../data/cmake/Qt5PluginTarget.cmake.in | 22 +- + .../data/cmake/Qt5BasicConfig.cmake.in | 311 +++++++++++------- + .../data/cmake/Qt5PluginTarget.cmake.in | 32 +- .../cmake/Qt5StaticOnlyRedirection.cmake.in | 11 + src/corelib/Qt5CoreConfigExtras.cmake.in | 24 +- src/gui/Qt5GuiConfigExtras.cmake.in | 8 +- src/testlib/Qt5TestConfigExtras.cmake.in | 2 +- - 7 files changed, 320 insertions(+), 147 deletions(-) + 7 files changed, 318 insertions(+), 166 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 -index a94f443de6..a0166e4230 100644 +index 37689938eb..636a2af9b6 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -68,7 +68,7 @@ split_incpath { @@ -99,7 +99,7 @@ index a94f443de6..a0166e4230 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -271,26 +278,34 @@ mod_deps = +@@ -271,30 +278,38 @@ mod_deps = lib_deps = aux_mod_deps = aux_lib_deps = @@ -133,12 +133,16 @@ index a94f443de6..a0166e4230 100644 +CMAKE_INTERFACE_QT5_MODULE_DEPS_STATIC = $$join(aux_lib_deps_static, ";") +CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC = $$join(aux_compile_defs_static, ";") + # Interface libraries have to have all properties starting with "INTERFACE_". + CMAKE_FEATURE_PROPERTY_PREFIX = "" + equals(TEMPLATE, aux): CMAKE_FEATURE_PROPERTY_PREFIX = "INTERFACE_" + mac { + # this branch is broken by the patch, only apply when building for Windows !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -@@ -317,13 +332,6 @@ mac { +@@ -321,13 +336,6 @@ mac { CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll @@ -152,7 +156,7 @@ index a94f443de6..a0166e4230 100644 mingw { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a -@@ -331,14 +339,30 @@ mac { +@@ -335,14 +343,30 @@ mac { isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} @@ -183,7 +187,7 @@ index a94f443de6..a0166e4230 100644 !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -@@ -358,12 +382,12 @@ mac { +@@ -362,12 +386,12 @@ mac { INSTALLS += cmake_qt5_module_files cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in @@ -198,7 +202,7 @@ index a94f443de6..a0166e4230 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_config_file \ -@@ -373,11 +397,29 @@ cmake_qt5_module_files.files = \ +@@ -377,11 +401,29 @@ cmake_qt5_module_files.files = \ $$cmake_config_file.output \ $$cmake_config_version_file.output @@ -229,7 +233,7 @@ index a94f443de6..a0166e4230 100644 !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file -@@ -389,7 +431,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake +@@ -393,7 +435,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake exists($$cmake_macros_file.input) { CMAKE_MODULE_MACROS = "true" @@ -238,7 +242,7 @@ index a94f443de6..a0166e4230 100644 cmake_macros_file.CONFIG = verbatim !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file -@@ -397,7 +439,7 @@ exists($$cmake_macros_file.input) { +@@ -401,7 +443,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -248,10 +252,10 @@ index a94f443de6..a0166e4230 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 a82e6a886f..270d5c1c75 100644 +index 8b895ff544..0d33a96821 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) +@@ -2,6 +2,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") endif() @@ -285,7 +289,7 @@ index a82e6a886f..270d5c1c75 100644 !!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) !!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") -@@ -29,15 +56,19 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +@@ -28,15 +55,19 @@ set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") !!IF !equals(TEMPLATE, aux) # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. @@ -311,7 +315,7 @@ index a82e6a886f..270d5c1c75 100644 but this file does not exist. Possible reasons include: * The file was deleted, renamed, or moved to another location. * An install or uninstall procedure did not complete successfully. -@@ -178,19 +209,50 @@ if(NOT COMMAND _qt5_add_dependencies) +@@ -177,12 +208,24 @@ if(NOT COMMAND _qt5_add_dependencies) endif() endfunction() endif() @@ -328,43 +332,17 @@ index a82e6a886f..270d5c1c75 100644 -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION +!!IF !isEmpty(CMAKE_STATIC_TYPE) +macro(_populate_$${CMAKE_MODULE_NAME}_target_properties_static TARGET_NAME Configuration LIB_LOCATION IMPLIB_LOCATION - IsDebugAndRelease) -- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) ++ IsDebugAndRelease) +!!ELSE +macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_NAME Configuration LIB_LOCATION IMPLIB_LOCATION -+ IsDebugAndRelease) + IsDebugAndRelease) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) +!!ENDIF + set_property(TARGET ${TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -+ -+!!IF !isEmpty(CMAKE_WINDOWS_BUILD) -+!!IF !isEmpty(CMAKE_STATIC_TYPE) -+ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib/${LIB_LOCATION}\") -+!!ELSE -+ set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/bin/${LIB_LOCATION}\") -+!!ENDIF -+!!ELSE set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+!!ENDIF -+ -+!!ELSE // isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -+ -+!!IF !isEmpty(CMAKE_WINDOWS_BUILD) -+!!IF !isEmpty(CMAKE_STATIC_TYPE) -+ set(imported_location \"lib/${LIB_LOCATION}\") -+!!ELSE -+ set(imported_location \"bin/${LIB_LOCATION}\") -+!!ENDIF - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) -+!!ENDIF - - set(_deps - ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} -@@ -202,15 +264,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -200,20 +243,20 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI # FIXME: handle IsDebugAndRelease like in official version !!IF !isEmpty(CMAKE_STATIC_TYPE) @@ -383,7 +361,13 @@ index a82e6a886f..270d5c1c75 100644 \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" ) endif() -@@ -232,9 +294,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + !!ELSE +- set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES ++ set_target_properties(\"${TARGET_NAME}\" PROPERTIES + \"INTERFACE_LINK_LIBRARIES_${Configuration}\" \"${_deps}\" + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} + !!IF !isEmpty(CMAKE_LIB_SONAME) +@@ -230,9 +273,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI !!ELSE set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF @@ -398,7 +382,7 @@ index a82e6a886f..270d5c1c75 100644 \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} ) endif() -@@ -251,8 +317,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P +@@ -249,8 +296,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P endmacro() !!ENDIF @@ -408,7 +392,7 @@ index a82e6a886f..270d5c1c75 100644 !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -@@ -260,46 +325,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -258,46 +304,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" ) !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) @@ -473,7 +457,7 @@ index a82e6a886f..270d5c1c75 100644 endforeach() !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -@@ -308,16 +377,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -306,16 +356,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private) if (NOT _check_private STREQUAL -1) foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}) @@ -497,7 +481,7 @@ index a82e6a886f..270d5c1c75 100644 !!ENDIF // TEMPLATE != aux set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") -@@ -325,10 +398,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -323,10 +377,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\") !!ENDIF @@ -510,7 +494,7 @@ index a82e6a886f..270d5c1c75 100644 set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET) -@@ -336,17 +409,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -334,17 +388,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT) @@ -532,7 +516,7 @@ index a82e6a886f..270d5c1c75 100644 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} -@@ -354,25 +427,25 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -352,25 +406,25 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) endif() @@ -570,7 +554,7 @@ index a82e6a886f..270d5c1c75 100644 !!ENDIF // TEMPLATE != aux # It can happen that the same FooConfig.cmake file is included when calling find_package() -@@ -387,11 +460,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -385,11 +439,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) # # Make sure to return early in the original Config inclusion, because the target has already # been defined as part of the second inclusion. @@ -588,7 +572,7 @@ index a82e6a886f..270d5c1c75 100644 !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") -@@ -402,13 +480,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -400,13 +459,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_DEBUG_TYPE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( @@ -604,7 +588,7 @@ index a82e6a886f..270d5c1c75 100644 _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS ) -@@ -418,13 +496,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -416,13 +475,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_RELEASE_TYPE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( @@ -620,16 +604,18 @@ index a82e6a886f..270d5c1c75 100644 _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS ) -@@ -432,32 +510,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!ENDIF +@@ -431,57 +490,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() + !!IF equals(TEMPLATE, aux) +- add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) ++ add_library(${TARGET_NAME} INTERFACE IMPORTED) + !!ELSE - add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") -+!!ENDIF -+!!IF !isEmpty(CMAKE_STATIC_TYPE) + add_library(${TARGET_NAME} STATIC IMPORTED) + set_property(TARGET ${TARGET_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") + !!ENDIF !!ELSE // !isEmpty(CMAKE_STATIC_TYPE) !!IF equals(TEMPLATE, aux) @@ -641,6 +627,18 @@ index a82e6a886f..270d5c1c75 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) @@ -672,12 +670,30 @@ index a82e6a886f..270d5c1c75 100644 + set_property(TARGET ${TARGET_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";")) + set_property(TARGET ${TARGET_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";")) + # Qt 6 forward compatible properties. +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} ++ set_property(TARGET ${TARGET_NAME} + PROPERTY $${CMAKE_FEATURE_PROPERTY_PREFIX}QT_ENABLED_PUBLIC_FEATURES + $$join(QT.$${MODULE}.enabled_features, ";")) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} ++ set_property(TARGET ${TARGET_NAME} + PROPERTY $${CMAKE_FEATURE_PROPERTY_PREFIX}QT_DISABLED_PUBLIC_FEATURES + $$join(QT.$${MODULE}.disabled_features, ";")) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} ++ set_property(TARGET ${TARGET_NAME} + PROPERTY $${CMAKE_FEATURE_PROPERTY_PREFIX}QT_ENABLED_PRIVATE_FEATURES + $$join(QT.$${MODULE}_private.enabled_features, ";")) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} ++ set_property(TARGET ${TARGET_NAME} + PROPERTY $${CMAKE_FEATURE_PROPERTY_PREFIX}QT_DISABLED_PRIVATE_FEATURES + $$join(QT.$${MODULE}_private.disabled_features, ";")) + - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_PLUGIN_TYPES \"$${CMAKE_MODULE_PLUGIN_TYPES}\") + set_property(TARGET ${TARGET_NAME} PROPERTY INTERFACE_QT_PLUGIN_TYPES \"$${CMAKE_MODULE_PLUGIN_TYPES}\") # Find plugin targets file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\") -@@ -471,7 +562,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -495,7 +565,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endforeach() endif() @@ -689,7 +705,7 @@ index a82e6a886f..270d5c1c75 100644 set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG}) !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -@@ -479,7 +574,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -503,7 +577,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") !!ENDIF @@ -701,7 +717,7 @@ index a82e6a886f..270d5c1c75 100644 set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location} ) -@@ -509,17 +608,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -533,17 +611,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endforeach() endif() @@ -726,7 +742,7 @@ index a82e6a886f..270d5c1c75 100644 ) set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS) foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}) -@@ -528,69 +630,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -552,17 +633,18 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() endforeach() !!IF !isEmpty(CMAKE_STATIC_TYPE) @@ -739,8 +755,20 @@ index a82e6a886f..270d5c1c75 100644 + set_property(TARGET ${TARGET_NAME}Private PROPERTY + INTERFACE_LINK_LIBRARIES ${TARGET_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} ) + + # Add a versionless target, for compatibility with Qt6. +- if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::$${CMAKE_MODULE_NAME}Private) +- add_library(Qt::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED) +- set_target_properties(Qt::$${CMAKE_MODULE_NAME}Private PROPERTIES +- INTERFACE_LINK_LIBRARIES \"Qt5::$${CMAKE_MODULE_NAME}Private\" ++ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET ${QT_VARIANT_PREFIX}Qt::$${CMAKE_MODULE_NAME}Private) ++ add_library(${QT_VARIANT_PREFIX}Qt::$${CMAKE_MODULE_NAME}Private INTERFACE IMPORTED) ++ set_target_properties(${QT_VARIANT_PREFIX}Qt::$${CMAKE_MODULE_NAME}Private PROPERTIES ++ INTERFACE_LINK_LIBRARIES \"${TARGET_NAME}Private\" + ) + endif() !!ENDIF // CMAKE_STATIC_TYPE - endif() +@@ -570,59 +652,61 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_RELEASE_TYPE) @@ -822,7 +850,7 @@ index a82e6a886f..270d5c1c75 100644 if (EXISTS !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -@@ -603,7 +708,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -635,7 +719,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF @@ -831,7 +859,7 @@ index a82e6a886f..270d5c1c75 100644 endif() !!ENDIF // CMAKE_STATIC_TYPE -@@ -613,19 +718,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -645,18 +729,21 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // CMAKE_DEBUG_TYPE !!ELSE // TEMPLATE != aux @@ -851,16 +879,15 @@ index a82e6a886f..270d5c1c75 100644 + include(\"${CMAKE_CURRENT_LIST_DIR}/../${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}Macros.cmake\") !!ENDIF --_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\") +- _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\") +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+_qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${CMAKE_CURRENT_LIST_DIR}/../${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\") ++ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${CMAKE_CURRENT_LIST_DIR}/../${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}/${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}ConfigVersion.cmake\") +!!ELSE -+_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\") ++ _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() diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -index 25f2162fe6..eb286293b7 100644 +index acbe1cc33b..65869c5122 100644 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in @@ -1,13 +1,13 @@ @@ -881,7 +908,7 @@ index 25f2162fe6..eb286293b7 100644 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} -@@ -17,14 +17,22 @@ foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES}) +@@ -17,17 +17,25 @@ foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES}) endforeach() !!IF !isEmpty(CMAKE_RELEASE_TYPE) @@ -904,9 +931,18 @@ index 25f2162fe6..eb286293b7 100644 !!ENDIF -list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) +-set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY QT_ALL_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED} Qt5::$${CMAKE_PLUGIN_NAME}) +-set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\") +-set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\") +-set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\") +-endif() +\ No newline at end of file +list(APPEND ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PLUGINS ${QT_VARIANT_PREFIX}Qt5::$$CMAKE_PLUGIN_NAME) - - endif() ++set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY QT_ALL_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED} ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_PLUGIN_NAME}) ++set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\") ++set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\") ++set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\") ++endif() diff --git a/mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in b/mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in new file mode 100644 index 0000000000..0091940fd2 @@ -925,17 +961,19 @@ 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 9b672327ef..58d1d5b366 100644 +index 4c1c3a612b..020b14cc83 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -1,4 +1,6 @@ +@@ -2,6 +2,8 @@ if(NOT DEFINED QT_DEFAULT_MAJOR_VERSION) + set(QT_DEFAULT_MAJOR_VERSION 5) + endif() +set(IMPORTED_TARGET_NAME ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}) + if (NOT TARGET Qt5::qmake) add_executable(Qt5::qmake IMPORTED) -@@ -52,9 +54,9 @@ set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake) +@@ -55,9 +57,9 @@ set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake) set(Qt5Core_MOC_EXECUTABLE Qt5::moc) set(Qt5Core_RCC_EXECUTABLE Qt5::rcc) @@ -948,7 +986,7 @@ index 9b672327ef..58d1d5b366 100644 COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION QT_COORD_TYPE ) -@@ -65,7 +67,7 @@ foreach(_dir ${_qt5_corelib_extra_includes}) +@@ -68,7 +70,7 @@ foreach(_dir ${_qt5_corelib_extra_includes}) endforeach() list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_corelib_extra_includes}) @@ -957,7 +995,7 @@ index 9b672327ef..58d1d5b366 100644 set(_qt5_corelib_extra_includes) # Targets using Qt need to use the POSITION_INDEPENDENT_CODE property. The -@@ -80,7 +82,7 @@ set(Qt5_POSITION_INDEPENDENT_CODE True) +@@ -83,7 +85,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. @@ -966,7 +1004,7 @@ index 9b672327ef..58d1d5b366 100644 # TODO Qt6: Remove set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\") -@@ -88,7 +90,7 @@ set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\") +@@ -91,7 +93,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) @@ -975,7 +1013,7 @@ index 9b672327ef..58d1d5b366 100644 !!ENDIF !!IF !isEmpty(CMAKE_DISABLED_FEATURES) -@@ -97,9 +99,9 @@ set(Qt5_DISABLED_FEATURES +@@ -100,9 +102,9 @@ set(Qt5_DISABLED_FEATURES ) !!ENDIF @@ -987,7 +1025,7 @@ index 9b672327ef..58d1d5b366 100644 !!IF qtConfig(reduce_exports) set(QT_VISIBILITY_AVAILABLE \"True\") -@@ -147,14 +149,14 @@ if (NOT TARGET Qt5::WinMain) +@@ -150,14 +152,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>) @@ -1049,5 +1087,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.26.1 +2.26.2 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 32a4227c5465..b062b0c3eddb 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,29 +1,31 @@ -From 089d8ff8c8306acdfa6c9c96c41498b2e5771be6 Mon Sep 17 00:00:00 2001 +From c43b98b48c09a6a45810f899fc5775542ffb7e1c 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 cmake/mingw-w64 -Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d +It is not clear anymore where I picked that change up and for +what reason. Never touch a running system so let's keep it. + +Change-Id: Iad665f18da5b4540f0899829a0165e1d3aa4ea60 --- - src/corelib/Qt5CoreConfigExtras.cmake.in | 7 +++++++ - 1 file changed, 7 insertions(+) + src/corelib/Qt5CoreConfigExtras.cmake.in | 6 ++++++ + 1 file changed, 6 insertions(+) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 58d1d5b366..967dc64a19 100644 +index 020b14cc83..fb9d79dc80 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -179,3 +179,10 @@ if (ANDROID_PLATFORM) +@@ -203,3 +203,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain) + ) endif() - - _qt5_Core_check_file_exists(${_Qt5CTestMacros}) + !!ENDIF + +!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +set(_isExe $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>) +# INTERFACE_LINK_LIBRARIES is used to pass a linker flag '-static' and library ws2_32 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +unset(_isExe) -+!!ENDIF -- -2.26.1 +2.26.2 diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch index c82086ceb990..e08dbb024efc 100644 --- a/0023-Use-correct-pkg-config-static-flag.patch +++ b/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From ce7fd8296fa3e9a7438b93c8f76fa821e6a4024a Mon Sep 17 00:00:00 2001 +From 0da96acd50b724b4b46868f4938c37ea96239a1a 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 910e59188f..aaa4123f4c 100644 +index 8b968ba297..f3ebfbc949 100644 --- a/configure.pri +++ b/configure.pri -@@ -345,6 +345,9 @@ defineTest(qtConfTest_detectPkgConfig) { +@@ -349,6 +349,9 @@ defineTest(qtConfTest_detectPkgConfig) { qtLog("Found pkg-config from path: $$pkgConfig") } } @@ -22,5 +22,5 @@ index 910e59188f..aaa4123f4c 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.26.1 +2.26.2 diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index 2da58ef1ff61..e63010093abf 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 7a3de1e7695a79bde92ed2bb58eaf0c04ade9e7e Mon Sep 17 00:00:00 2001 +From a23f88d109a240c136e19f0dcd15ba0e7aba1804 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,10 +18,10 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 02f49a4b1e..581dbeac50 100644 +index 88350cb68b..e1e0aa1125 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake -@@ -139,8 +139,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target +@@ -153,8 +153,9 @@ function(qt5_create_moc_command infile outfile moc_flags moc_options moc_target endif() set(_moc_extra_parameters_file @${_moc_parameters_file}) @@ -32,7 +32,7 @@ index 02f49a4b1e..581dbeac50 100644 DEPENDS ${infile} ${moc_depends} ${_moc_working_dir} VERBATIM) -@@ -255,8 +256,9 @@ function(QT5_ADD_BINARY_RESOURCES target ) +@@ -295,8 +296,9 @@ function(qt5_add_binary_resources target) set(rc_depends ${rc_depends} ${_rc_depends}) endforeach() @@ -43,8 +43,8 @@ index 02f49a4b1e..581dbeac50 100644 ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles} DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM) add_custom_target(${target} ALL DEPENDS ${rcc_destination}) -@@ -288,8 +290,9 @@ function(QT5_ADD_RESOURCES outfiles ) - _QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends) +@@ -339,8 +341,9 @@ function(qt5_add_resources outfiles) + _qt5_parse_qrc_file(${infile} _out_depends _rc_depends) set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON) + get_target_property(MOC_LOC ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION) @@ -55,10 +55,10 @@ index 02f49a4b1e..581dbeac50 100644 MAIN_DEPENDENCY ${infile} DEPENDS ${_rc_depends} "${_out_depends}" VERBATIM) diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake -index 737371a5ad..d103278cdf 100644 +index 35d2a2dc54..99f061f1b8 100644 --- a/src/widgets/Qt5WidgetsMacros.cmake +++ b/src/widgets/Qt5WidgetsMacros.cmake -@@ -55,8 +55,9 @@ function(QT5_WRAP_UI outfiles ) +@@ -55,8 +55,9 @@ function(qt5_wrap_ui outfiles ) get_filename_component(outfile ${it} NAME_WE) get_filename_component(infile ${it} ABSOLUTE) set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h) @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.26.1 +2.26.2 diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch index bcbe48128fae..9da5d8f30255 100644 --- a/0025-Ignore-errors-about-missing-feature-static.patch +++ b/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From 2bdc5cdeae34bd597089e931b69f44479caf841e Mon Sep 17 00:00:00 2001 +From bd0a5e2d7941e2b4207e2f6759c249b6ac3f32a9 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.1 +2.26.2 diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch index d44d08e53776..68fd04c5c473 100644 --- a/0026-Enable-and-fix-use-of-iconv.patch +++ b/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 49f3d67d12980ba69d8cd8e3a44bc0479916fb4e Mon Sep 17 00:00:00 2001 +From 0bdf8a9c211ff98412fd99d0bf93b00dbd12dc43 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 @@ -49,7 +49,7 @@ index 9c39727946..cc14036b25 100644 #else char **inBytesPtr = &inBytes; diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index ae360239c6..5fd57a1a66 100644 +index c5e0423273..0b12e22351 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -72,7 +72,7 @@ @@ -61,7 +61,7 @@ index ae360239c6..5fd57a1a66 100644 "char *outp;", "size_t inbytes, outbytes;", "iconv(x, &inp, &inbytes, &outp, &outbytes);", -@@ -672,9 +672,9 @@ +@@ -673,9 +673,9 @@ }, "gnu-libiconv": { "label": "GNU iconv", @@ -74,5 +74,5 @@ index ae360239c6..5fd57a1a66 100644 }, "icu": { -- -2.26.1 +2.26.2 diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch index f7ff6b517cd1..65557157334a 100644 --- a/0027-Ignore-failing-pkg-config-test.patch +++ b/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From e4ced51f891bf9c754725b1ea2558b4904a9b4ce Mon Sep 17 00:00:00 2001 +From c6e55bbd665d7a7693f791884b5ac83594a5e85a 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 a481e54b8d..34cac288a7 100644 +index 8bc5d3dd8a..3b0d8dbd0e 100644 --- a/configure.json +++ b/configure.json -@@ -755,7 +755,6 @@ +@@ -759,7 +759,6 @@ "pkg-config": { "label": "Using pkg-config", "autoDetect": "!config.darwin && !config.win32", @@ -21,5 +21,5 @@ index a481e54b8d..34cac288a7 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.26.1 +2.26.2 diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 5e66408af195..57997469f14e 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 0104780784ba1a49d5f034a95ba00743915c82b1 Mon Sep 17 00:00:00 2001 +From fe0da13a33630cc1684b16c040f2f7c1eb11d775 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 3a75986257..34e7776e44 100644 +index ad5086aadd..a238a6ea33 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 3a75986257..34e7776e44 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.26.1 +2.26.2 diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch index f8fa495e6336..3a9f60762b47 100644 --- a/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From f96561bfde665a530525fb9cd0091525774de43c Mon Sep 17 00:00:00 2001 +From 532db9dcf2931d1b548a2c0581cd01d07eb00e44 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 @@ -152,5 +152,5 @@ index 50a3bb41a9..285d90c6d3 100644 include(windows.pri) -- -2.26.1 +2.26.2 diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch index 0ccc7ff66eec..4c3e9e3d7888 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 9e55df2614a99e6fce2460ea3f32c1039bc9f0e6 Mon Sep 17 00:00:00 2001 +From 9cc80f62ffaec0261b0d554f80ff1413aa46d4d7 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 d6299d8eed..5311748953 100644 +index 4632cb8b30..7583943bd0 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 @@ -33,5 +33,5 @@ index d6299d8eed..5311748953 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.1 +2.26.2 diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index 0113efd5480f..69d999ba8232 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 20363801bd57755feb7ff76e6dd2103e6e946869 Mon Sep 17 00:00:00 2001 +From 7945a6439915939c437af09c2c1241dc0d28db9d 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.1 +2.26.2 @@ -13,8 +13,8 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base-static -pkgver=5.14.2 -pkgrel=2 +pkgver=5.15.0 +pkgrel=1 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('any') url='https://www.qt.io/' @@ -63,38 +63,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=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a' - '14affce3bf8d6a2d2682e0cc7113a62fe851a62fcd5a76539acfe1f4b0c9ea4b' - '96d750723b2e44fdb78520ebb369111391850554b55a4cb1c0a57299b97579fd' - '4daa7399d1b8523cdf1446e2e4e3cefeaf8a1b14a467f808c3fda9e8e8516965' - 'ef4d333e7f0aa5bcfe1b4f67bf687f5ea2c9698189a0d001080783829c1b85bf' - '54fcf347fe0355306b7ba122ff461c1153919908f89b1306ea50f4f8cf8c69f0' - 'e55dc7743472c72e58bf0ae780ca0a029670f075538a5c7c5658fe6742476985' - 'a5f5a87fc80182aeff9ea463c675243b91da432e02d0ca1e8d3b6f9f77013e4b' - '1fbf437012eca9276178180a2cb15b6b0296553ca9304ae258b1cce6aed15bc0' - '9a1d2f0f2059beeb70236e2f7ecbb2ef15e50644cb6a909a125306f067b3293f' - '701bff16f7ad0809dbb61806c050d0742df10e125c24a841db8712e6146d6235' - 'dfba051c3fec6a77bcd07ebcd4d5e077d7b6fc7ae5291d0680820ac0cc320f2d' - '8cc25ac98e8bff73fc980e4afc9e774569218145d2123808e14fe5d8649fe0d0' - '8c0709d32c38a226116126ecf4d7fc71944fe3d6a42b8b5a27351e824ed445eb' - 'dfd12ab7e72b9721d16f902e97fe1c3379d20ae52633610c56d10bcb5e294395' - '66c4cf8d218ee5582d6cf8836ed9916502e6ac5d4b77c46ee122460bb98f515d' - 'a5667634a5940620ca71cdc77c6e1ab656891c308d5053c25736e994ea4c78e0' - 'd82a344682f1290dfbc174ccdf35bbdeb4cf9f5418d3bfc664491451bb7a8229' - 'd10bbf540f58388557e5f39c447cff09ff1ddb733ea18f3d8678a308c478dbec' - '8691b0a628c04e624d8d98680cb54814a46cd9af67168155a1c46bc9ecd5eafe' - 'a75a275232484eb616942731052552764348654b413225a334082635558def39' - '4b8ceafdf29b045bcc3633c3b2f5682f925b9c79a73c738336e8c795201cbca0' - '065ffac8cc7835f941fbbf355aa1ba63c1203c0491672ce7f99576198c0ee3eb' - '567f9e136382f7373fd898d7699acc198767d2d5fa93375391826125aa7f7196' - '389697028d0a704caffa06e47d70d9c2c3cd852616d5a4cad6e6482d5e3e7ff2' - '90898fd84a95b03298d1eaa136459cd65b50957593e1e02a0c02be660097ddb1' - 'a4681e107f97cc802c1dc975c3118c492256e7baf398598061c7ae5ed3e1d65e' - 'e22cb9b06d182145433f4bbf7200273a009d62676570f476268ab8db2c23e36b' - 'eb409f1146c39f19d43fe71c103f40ec6c37d0760cae333f05146ca7e61b47b2' - '8ee993247e7240947e5e8a549407ebbda2fa9e73c8310b41caff7da767012a6c' - '03cb0da4cfe2315c4d8fc845e6a758f3ef6fc51883f993b3bf600653ab342579' - '745e15a29bea515c0d65ddad01851e06c8ece5f1f18a0df871f09d5db55057fb') +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') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -269,6 +269,7 @@ package() { rm -r "./StaticQt5OpenGLExtensions" popd rm "${pkgdir}/usr/${_arch}/lib/pkgconfig/StaticQt5OpenGLExtensions.pc" + rm "${pkgdir}/usr/${_arch}/lib/metatypes/"* # create links to static plugins in lib directory pushd "${pkgdir}/usr/${_arch}/lib/" && ln -s "./qt/plugins/"*/*.a . && popd diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt index 4b5ee578d566..b9c7429a5dc1 100644 --- a/qtbase-sha256.txt +++ b/qtbase-sha256.txt @@ -1 +1 @@ -48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a +9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5 |