cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

qt5: regen patches for 5.12.5 (conflicts/attention needed: mkspecs-mac, replace-libdir)

Browse source
This commit is contained in:
Will Dietz 2019-09-30 18:15:05 -05:00
parent b3594de31f
commit 35b13614b5
No known key found for this signature in database
GPG key ID: EBB0EA4124809D02
11 changed files with 76 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
View file

@ -1,18 +1,18 @@
From 58d98b66da5d748d610f053053bd12e42c97d9e6 Mon Sep 17 00:00:00 2001 From 361a9395704ca1ee170a8bb3823ba860293eecee Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:34:00 -0500 Date: Tue, 17 Sep 2019 05:34:00 -0500
Subject: [PATCH 01/11] qtbase-mkspecs-mac Subject: [PATCH 01/11] qtbase-mkspecs-mac
--- ---
mkspecs/common/mac.conf | 2 +- mkspecs/common/mac.conf | 2 +-
mkspecs/features/mac/default_post.prf | 196 -------------------------- mkspecs/features/mac/default_post.prf | 201 --------------------------
mkspecs/features/mac/default_pre.prf | 58 -------- mkspecs/features/mac/default_pre.prf | 58 --------
mkspecs/features/mac/sdk.mk | 25 ---- mkspecs/features/mac/sdk.mk | 25 ----
mkspecs/features/mac/sdk.prf | 61 -------- mkspecs/features/mac/sdk.prf | 61 --------
5 files changed, 1 insertion(+), 341 deletions(-) 5 files changed, 1 insertion(+), 346 deletions(-)
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index b77494ec..470c38e7 100644 index b77494ec9b..470c38e772 100644
--- a/mkspecs/common/mac.conf --- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf
@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \ @@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \
@ -25,10 +25,10 @@ index b77494ec..470c38e7 100644
QMAKE_LFLAGS_REL_RPATH = QMAKE_LFLAGS_REL_RPATH =
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index c46222de..18dcfbce 100644 index 26bd3e2e98..b80ec1e801 100644
--- a/mkspecs/features/mac/default_post.prf --- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf
@@ -64,202 +64,6 @@ qt { @@ -68,207 +68,6 @@ qt {
} }
} }
@ -212,6 +212,11 @@ index c46222de..18dcfbce 100644
- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} - QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT}
-} -}
- -
-!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) {
- # Explicit SDK version has been set, respect that
- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version
-}
-
-cache(QMAKE_XCODE_DEVELOPER_PATH, stash) -cache(QMAKE_XCODE_DEVELOPER_PATH, stash)
-!isEmpty(QMAKE_XCODE_VERSION): \ -!isEmpty(QMAKE_XCODE_VERSION): \
- cache(QMAKE_XCODE_VERSION, stash) - cache(QMAKE_XCODE_VERSION, stash)
@ -229,10 +234,10 @@ index c46222de..18dcfbce 100644
-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
- -
!macx-xcode { !macx-xcode {
generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_) generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS
generate_xcode_project.target = xcodeproj generate_xcode_project.target = xcodeproj
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
index e3534561..3b01424e 100644 index e3534561a5..3b01424e67 100644
--- a/mkspecs/features/mac/default_pre.prf --- a/mkspecs/features/mac/default_pre.prf
+++ b/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf
@@ -1,60 +1,2 @@ @@ -1,60 +1,2 @@
@ -297,7 +302,7 @@ index e3534561..3b01424e 100644
-xcode_copy_phase_strip_setting.value = NO -xcode_copy_phase_strip_setting.value = NO
-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
index c40f58c9..e69de29b 100644 index c40f58c987..e69de29bb2 100644
--- a/mkspecs/features/mac/sdk.mk --- a/mkspecs/features/mac/sdk.mk
+++ b/mkspecs/features/mac/sdk.mk +++ b/mkspecs/features/mac/sdk.mk
@@ -1,25 +0,0 @@ @@ -1,25 +0,0 @@
@ -327,7 +332,7 @@ index c40f58c9..e69de29b 100644
- endif - endif
-endif -endif
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index 3a9c2778..e69de29b 100644 index 3a9c2778bb..e69de29bb2 100644
--- a/mkspecs/features/mac/sdk.prf --- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf
@@ -1,61 +0,0 @@ @@ -1,61 +0,0 @@
@ -393,5 +398,5 @@ index 3a9c2778..e69de29b 100644
- cache($$tool_variable, set stash, $$tool) - cache($$tool_variable, set stash, $$tool)
-} -}
-- --
2.22.1 2.23.GIT

10
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch
View file

@ -1,4 +1,4 @@
From 203c9338dc92c2c36007cfe6633387348976637e Mon Sep 17 00:00:00 2001 From c8ca2cd3ebd870f52a25ea7d1962df993767be5b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:37:15 -0500 Date: Tue, 17 Sep 2019 05:37:15 -0500
Subject: [PATCH 02/11] qtbase-mac Subject: [PATCH 02/11] qtbase-mac
@ -13,10 +13,10 @@ Subject: [PATCH 02/11] qtbase-mac
6 files changed, 19 insertions(+), 7 deletions(-) 6 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
index f96e7358..650946b7 100644 index 168e0418e4..32542c332c 100644
--- a/src/corelib/kernel/qcore_mac_p.h --- a/src/corelib/kernel/qcore_mac_p.h
+++ b/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h
@@ -212,7 +212,7 @@ private: @@ -213,7 +213,7 @@ private:
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@ -25,7 +25,7 @@ index f96e7358..650946b7 100644
QT_END_NAMESPACE QT_END_NAMESPACE
#include <os/activity.h> #include <os/activity.h>
@@ -290,7 +290,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); @@ -291,7 +291,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current);
#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter();
@ -112,5 +112,5 @@ index e63e89a7..213b6945 100644
#endif #endif
#if defined(HAVE_XCTEST) #if defined(HAVE_XCTEST)
-- --
2.23.0 2.23.GIT

32
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch
View file

@ -1,4 +1,4 @@
From 5ff996d9028c0f54939ca7c54d358cd7503ab1ae Mon Sep 17 00:00:00 2001 From 8bdbddc2e5fef1553b1ba0297d3c03b38e9b947b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 18 Sep 2019 05:39:39 -0500 Date: Wed, 18 Sep 2019 05:39:39 -0500
Subject: [PATCH 03/11] qtbase-mkspecs Subject: [PATCH 03/11] qtbase-mkspecs
@ -18,7 +18,7 @@ Subject: [PATCH 03/11] qtbase-mkspecs
11 files changed, 39 insertions(+), 142 deletions(-) 11 files changed, 39 insertions(+), 142 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index c9910dda..e9bc8076 100644 index 00da9bd33f..bd166fbfea 100644
--- a/mkspecs/features/create_cmake.prf --- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf
@@ -21,7 +21,7 @@ load(cmake_functions) @@ -21,7 +21,7 @@ load(cmake_functions)
@ -30,7 +30,7 @@ index c9910dda..e9bc8076 100644
contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR
CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
@@ -60,45 +60,20 @@ split_incpath { @@ -70,45 +70,20 @@ split_incpath {
$$cmake_extra_source_includes.output $$cmake_extra_source_includes.output
} }
@ -87,7 +87,7 @@ index c9910dda..e9bc8076 100644
static|staticlib:CMAKE_STATIC_TYPE = true static|staticlib:CMAKE_STATIC_TYPE = true
@@ -178,7 +153,7 @@ contains(CONFIG, plugin) { @@ -188,7 +163,7 @@ contains(CONFIG, plugin) {
cmake_target_file cmake_target_file
cmake_qt5_plugin_file.files = $$cmake_target_file.output cmake_qt5_plugin_file.files = $$cmake_target_file.output
@ -96,7 +96,7 @@ index c9910dda..e9bc8076 100644
INSTALLS += cmake_qt5_plugin_file INSTALLS += cmake_qt5_plugin_file
return() return()
@@ -323,7 +298,7 @@ exists($$cmake_macros_file.input) { @@ -333,7 +308,7 @@ exists($$cmake_macros_file.input) {
cmake_qt5_module_files.files += $$cmake_macros_file.output cmake_qt5_module_files.files += $$cmake_macros_file.output
} }
@ -106,7 +106,7 @@ index c9910dda..e9bc8076 100644
# We are generating cmake files. Most developers of Qt are not aware of cmake, # 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 # 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 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index c7298928..c60ef16e 100644 index c729892889..c60ef16e64 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) @@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
@ -266,7 +266,7 @@ index c7298928..c60ef16e 100644
set_target_properties(Qt5::${Plugin} PROPERTIES set_target_properties(Qt5::${Plugin} PROPERTIES
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location} \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
index 57cfec78..5cbd7c52 100644 index 57cfec78b3..5cbd7c52ef 100644
--- a/mkspecs/features/qml_module.prf --- a/mkspecs/features/qml_module.prf
+++ b/mkspecs/features/qml_module.prf +++ b/mkspecs/features/qml_module.prf
@@ -51,7 +51,7 @@ builtin_resources { @@ -51,7 +51,7 @@ builtin_resources {
@ -279,7 +279,7 @@ index 57cfec78..5cbd7c52 100644
qmlfiles.base = $$_PRO_FILE_PWD_ qmlfiles.base = $$_PRO_FILE_PWD_
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index ad8ecdf5..804634b2 100644 index ad8ecdf5f1..804634b22e 100644
--- a/mkspecs/features/qml_plugin.prf --- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf
@@ -50,7 +50,7 @@ load(qt_build_paths) @@ -50,7 +50,7 @@ load(qt_build_paths)
@ -292,7 +292,7 @@ index ad8ecdf5..804634b2 100644
# Some final setup # Some final setup
diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
index 8354f30e..62028fef 100644 index 8354f30eea..62028fef8e 100644
--- a/mkspecs/features/qt_app.prf --- a/mkspecs/features/qt_app.prf
+++ b/mkspecs/features/qt_app.prf +++ b/mkspecs/features/qt_app.prf
@@ -30,7 +30,7 @@ host_build:force_bootstrap { @@ -30,7 +30,7 @@ host_build:force_bootstrap {
@ -305,7 +305,7 @@ index 8354f30e..62028fef 100644
} }
INSTALLS += target INSTALLS += target
diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf
index 3bb3823a..655b7b7d 100644 index 3bb3823a8e..655b7b7db8 100644
--- a/mkspecs/features/qt_build_paths.prf --- a/mkspecs/features/qt_build_paths.prf
+++ b/mkspecs/features/qt_build_paths.prf +++ b/mkspecs/features/qt_build_paths.prf
@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ @@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \
@ -318,7 +318,7 @@ index 3bb3823a..655b7b7d 100644
+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT + MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT
} }
diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
index 3b74cd4d..6bfbbe6e 100644 index 3b74cd4dd5..6bfbbe6e2d 100644
--- a/mkspecs/features/qt_docs.prf --- a/mkspecs/features/qt_docs.prf
+++ b/mkspecs/features/qt_docs.prf +++ b/mkspecs/features/qt_docs.prf
@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR @@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR
@ -357,7 +357,7 @@ index 3b74cd4d..6bfbbe6e 100644
INSTALLS += inst_qch_docs INSTALLS += inst_qch_docs
diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
index 43b58817..e635b8f6 100644 index 43b58817fe..e635b8f67a 100644
--- a/mkspecs/features/qt_example_installs.prf --- a/mkspecs/features/qt_example_installs.prf
+++ b/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf
@@ -88,7 +88,7 @@ sourcefiles += \ @@ -88,7 +88,7 @@ sourcefiles += \
@ -370,7 +370,7 @@ index 43b58817..e635b8f6 100644
check_examples { check_examples {
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 1903e509..ae7b5859 100644 index 1903e509c8..ae7b585989 100644
--- a/mkspecs/features/qt_functions.prf --- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf
@@ -69,7 +69,7 @@ defineTest(qtHaveModule) { @@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
@ -383,7 +383,7 @@ index 1903e509..ae7b5859 100644
$${1}_EXE = $${cmd}.pl $${1}_EXE = $${cmd}.pl
cmd = perl -w $$system_path($${cmd}.pl) cmd = perl -w $$system_path($${cmd}.pl)
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
index 1ebca173..b784441d 100644 index 1ebca17366..b784441da0 100644
--- a/mkspecs/features/qt_installs.prf --- a/mkspecs/features/qt_installs.prf
+++ b/mkspecs/features/qt_installs.prf +++ b/mkspecs/features/qt_installs.prf
@@ -12,16 +12,10 @@ @@ -12,16 +12,10 @@
@ -448,7 +448,7 @@ index 1ebca173..b784441d 100644
INSTALLS += privpritarget INSTALLS += privpritarget
} }
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
index 40528a65..903f7952 100644 index 40528a65e2..903f795284 100644
--- a/mkspecs/features/qt_plugin.prf --- a/mkspecs/features/qt_plugin.prf
+++ b/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf
@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { @@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build {
@ -461,5 +461,5 @@ index 40528a65..903f7952 100644
TARGET = $$qt5LibraryTarget($$TARGET) TARGET = $$qt5LibraryTarget($$TARGET)
-- --
2.22.1 2.23.GIT

16
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch
View file

@ -1,4 +1,4 @@
From d126db8f5c2c1f6d6738de1a53040c93fdf6ff73 Mon Sep 17 00:00:00 2001 From 492f6555bb09f207c83387441f0f23ba4602dfff Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 18 Sep 2019 05:39:50 -0500 Date: Wed, 18 Sep 2019 05:39:50 -0500
Subject: [PATCH 04/11] qtbase-replace-libdir Subject: [PATCH 04/11] qtbase-replace-libdir
@ -9,7 +9,7 @@ Subject: [PATCH 04/11] qtbase-replace-libdir
2 files changed, 3 insertions(+), 22 deletions(-) 2 files changed, 3 insertions(+), 22 deletions(-)
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index caecb68a..d3aa3ba5 100644 index caecb68a84..d3aa3ba570 100644
--- a/mkspecs/features/qt_common.prf --- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf
@@ -30,32 +30,16 @@ contains(TEMPLATE, .*lib) { @@ -30,32 +30,16 @@ contains(TEMPLATE, .*lib) {
@ -48,10 +48,10 @@ index caecb68a..d3aa3ba5 100644
# The remainder of this file must not apply to host tools/libraries, # The remainder of this file must not apply to host tools/libraries,
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 51b5bde6..82e2907c 100644 index ee7de22059..9015b30d73 100644
--- a/mkspecs/features/qt_module.prf --- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf
@@ -292,10 +292,7 @@ load(qt_targets) @@ -303,10 +303,7 @@ load(qt_targets)
} }
!lib_bundle:unix { !lib_bundle:unix {
CONFIG += create_libtool CONFIG += create_libtool
@ -60,9 +60,9 @@ index 51b5bde6..82e2907c 100644
- else: \ - else: \
- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" - QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]"
+ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib + QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib
ltlib_replace.match = $$lib_replace.match !isEmpty(lib_replace0.match) {
!isEmpty(lib_replace.replace): \ ltlib_replace0.match = $$lib_replace0.match
ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/
-- --
2.22.1 2.23.GIT

20
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch
View file

@ -1,4 +1,4 @@
From 0ea804da2eb1d0cfbbfc15fbc33a3d7dd5de36ed Mon Sep 17 00:00:00 2001 From 6f53835deae80b28ec5c1c9a5c0294bbcc87f91b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:34:28 -0500 Date: Tue, 17 Sep 2019 05:34:28 -0500
Subject: [PATCH 05/11] qtbase-cmake Subject: [PATCH 05/11] qtbase-cmake
@ -15,7 +15,7 @@ Subject: [PATCH 05/11] qtbase-cmake
8 files changed, 16 insertions(+), 24 deletions(-) 8 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index c60ef16e..e354ab91 100644 index c60ef16e64..e354ab9156 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -278,7 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) @@ -278,7 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@ -28,7 +28,7 @@ index c60ef16e..e354ab91 100644
set_target_properties(Qt5::${Plugin} PROPERTIES set_target_properties(Qt5::${Plugin} PROPERTIES
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location} \"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
index 5baf0fdb..3583745a 100644 index 5baf0fdb10..3583745aea 100644
--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
@ -45,7 +45,7 @@ index 5baf0fdb..3583745a 100644
list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
index e0652fdc..450b2a2d 100644 index e0652fdcf9..450b2a2d28 100644
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in --- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
@ -94,7 +94,7 @@ index e0652fdc..450b2a2d 100644
set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
!!ENDIF !!ENDIF
diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
index c357237d..6f0c75de 100644 index c357237d0e..6f0c75de3c 100644
--- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in --- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
@ -106,7 +106,7 @@ index c357237d..6f0c75de 100644
set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF !!ENDIF
diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
index 706304cf..546420f6 100644 index 706304cf34..546420f6ad 100644
--- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in --- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
@ -118,7 +118,7 @@ index 706304cf..546420f6 100644
set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF !!ENDIF
diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
index 1d947159..b36865fc 100644 index 1d947159e2..b36865fc48 100644
--- a/src/dbus/Qt5DBusConfigExtras.cmake.in --- a/src/dbus/Qt5DBusConfigExtras.cmake.in
+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
@@ -2,11 +2,7 @@ @@ -2,11 +2,7 @@
@ -148,7 +148,7 @@ index 1d947159..b36865fc 100644
set_target_properties(Qt5::qdbusxml2cpp PROPERTIES set_target_properties(Qt5::qdbusxml2cpp PROPERTIES
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
index 84dbbfeb..8ad0720c 100644 index 84dbbfebd4..8ad0720c5c 100644
--- a/src/gui/Qt5GuiConfigExtras.cmake.in --- a/src/gui/Qt5GuiConfigExtras.cmake.in
+++ b/src/gui/Qt5GuiConfigExtras.cmake.in +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
@ -177,7 +177,7 @@ index 84dbbfeb..8ad0720c 100644
set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
!!ENDIF !!ENDIF
diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
index 99d87e2e..a4eab2aa 100644 index 99d87e2e46..a4eab2aa72 100644
--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in --- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
@ -190,5 +190,5 @@ index 99d87e2e..a4eab2aa 100644
set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
!!ENDIF !!ENDIF
-- --
2.22.1 2.23.GIT

6
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0006-qtbase-gtk3.patch
View file

@ -1,4 +1,4 @@
From 8fa184fb70a62cbe9ee160bceddaf5d7c21cb85c Mon Sep 17 00:00:00 2001 From 5bf1785809baf6be7fb5904ce6cefdb761f2c278 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:35:33 -0500 Date: Tue, 17 Sep 2019 05:35:33 -0500
Subject: [PATCH 06/11] qtbase-gtk3 Subject: [PATCH 06/11] qtbase-gtk3
@ -8,7 +8,7 @@ Subject: [PATCH 06/11] qtbase-gtk3
1 file changed, 16 insertions(+), 1 deletion(-) 1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp
index fb1c425d..bb8bab97 100644 index fb1c425d8e..bb8bab9795 100644
--- a/src/plugins/platformthemes/gtk3/main.cpp --- a/src/plugins/platformthemes/gtk3/main.cpp
+++ b/src/plugins/platformthemes/gtk3/main.cpp +++ b/src/plugins/platformthemes/gtk3/main.cpp
@@ -39,6 +39,7 @@ @@ -39,6 +39,7 @@
@ -44,5 +44,5 @@ index fb1c425d..bb8bab97 100644
return 0; return 0;
} }
-- --
2.22.1 2.23.GIT

6
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0007-qtbase-xcursor.patch
View file

@ -1,4 +1,4 @@
From b4fe78eb31f30ef499970b2ca7e7947c025588af Mon Sep 17 00:00:00 2001 From 35e80f303ae6a6c4c53ba8eb3d84574cc03d68d8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:35:58 -0500 Date: Tue, 17 Sep 2019 05:35:58 -0500
Subject: [PATCH 07/11] qtbase-xcursor Subject: [PATCH 07/11] qtbase-xcursor
@ -8,7 +8,7 @@ Subject: [PATCH 07/11] qtbase-xcursor
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp
index fbadab4d..c83ce0af 100644 index fbadab4d50..c83ce0af5b 100644
--- a/src/plugins/platforms/xcb/qxcbcursor.cpp --- a/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +++ b/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) @@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen)
@ -25,5 +25,5 @@ index fbadab4d..c83ce0af 100644
} }
if (xcursorFound) { if (xcursorFound) {
-- --
2.22.1 2.23.GIT

6
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0008-qtbase-xcompose.patch
View file

@ -1,4 +1,4 @@
From 47b2bed58224bda2267480604707a580dc17dd1f Mon Sep 17 00:00:00 2001 From b7c1c103ba04e76ae498f87ca9ef2c4e09e36d7e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:36:10 -0500 Date: Tue, 17 Sep 2019 05:36:10 -0500
Subject: [PATCH 08/11] qtbase-xcompose Subject: [PATCH 08/11] qtbase-xcompose
@ -8,7 +8,7 @@ Subject: [PATCH 08/11] qtbase-xcompose
1 file changed, 1 insertion(+), 4 deletions(-) 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index b5a0a5bb..6c20305f 100644 index b5a0a5bbeb..6c20305f4d 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations() @@ -265,12 +265,9 @@ void TableGenerator::initPossibleLocations()
@ -26,5 +26,5 @@ index b5a0a5bb..6c20305f 100644
QString TableGenerator::findComposeFile() QString TableGenerator::findComposeFile()
-- --
2.22.1 2.23.GIT

10
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0009-qtbase-tzdir.patch
View file

@ -1,4 +1,4 @@
From 354713a61005b9a4743b9db0d76c72514c4579f8 Mon Sep 17 00:00:00 2001 From db9686362ae34e02538e449e0edfe3d61065b2e9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:36:25 -0500 Date: Tue, 17 Sep 2019 05:36:25 -0500
Subject: [PATCH 09/11] qtbase-tzdir Subject: [PATCH 09/11] qtbase-tzdir
@ -8,10 +8,10 @@ Subject: [PATCH 09/11] qtbase-tzdir
1 file changed, 14 insertions(+), 6 deletions(-) 1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/tools/qtimezoneprivate_tz.cpp
index 7d85bc07..c13d99b8 100644 index 57bc000af5..d7d8119682 100644
--- a/src/corelib/tools/qtimezoneprivate_tz.cpp --- a/src/corelib/tools/qtimezoneprivate_tz.cpp
+++ b/src/corelib/tools/qtimezoneprivate_tz.cpp +++ b/src/corelib/tools/qtimezoneprivate_tz.cpp
@@ -71,7 +71,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash; @@ -77,7 +77,11 @@ typedef QHash<QByteArray, QTzTimeZone> QTzTimeZoneHash;
// Parse zone.tab table, assume lists all installed zones, if not will need to read directories // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
static QTzTimeZoneHash loadTzTimeZones() static QTzTimeZoneHash loadTzTimeZones()
{ {
@ -24,7 +24,7 @@ index 7d85bc07..c13d99b8 100644
if (!QFile::exists(path)) if (!QFile::exists(path))
path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
@@ -650,12 +654,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) @@ -656,12 +660,16 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId)
if (!tzif.open(QIODevice::ReadOnly)) if (!tzif.open(QIODevice::ReadOnly))
return; return;
} else { } else {
@ -47,5 +47,5 @@ index 7d85bc07..c13d99b8 100644
} }
-- --
2.22.1 2.23.GIT

8
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0010-qtbase-qtpluginpath.patch
View file

@ -1,4 +1,4 @@
From 571060c0e1dca29554cc97cfb33087c9b41114a5 Mon Sep 17 00:00:00 2001 From a3aaebda6d4b302cd202c21e306c55d3715e9b0d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:36:41 -0500 Date: Tue, 17 Sep 2019 05:36:41 -0500
Subject: [PATCH 10/11] qtbase-qtpluginpath Subject: [PATCH 10/11] qtbase-qtpluginpath
@ -8,10 +8,10 @@ Subject: [PATCH 10/11] qtbase-qtpluginpath
1 file changed, 9 insertions(+) 1 file changed, 9 insertions(+)
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 8652c456..74562272 100644 index db6546028a..cc97c46004 100644
--- a/src/corelib/kernel/qcoreapplication.cpp --- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2690,6 +2690,15 @@ QStringList QCoreApplication::libraryPaths() @@ -2694,6 +2694,15 @@ QStringList QCoreApplication::libraryPaths()
QStringList *app_libpaths = new QStringList; QStringList *app_libpaths = new QStringList;
coreappdata()->app_libpaths.reset(app_libpaths); coreappdata()->app_libpaths.reset(app_libpaths);
@ -28,5 +28,5 @@ index 8652c456..74562272 100644
if (!libPathEnv.isEmpty()) { if (!libPathEnv.isEmpty()) {
QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts);
-- --
2.22.1 2.23.GIT

6
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0011-qtbase-assert.patch
View file

@ -1,4 +1,4 @@
From 545e696e270a3879dd59f71d145e31a7d93ab8f4 Mon Sep 17 00:00:00 2001 From 4f93027de0e9b825c4b7853d583e9b02a0443c6b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org> From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:37:04 -0500 Date: Tue, 17 Sep 2019 05:37:04 -0500
Subject: [PATCH 11/11] qtbase-assert Subject: [PATCH 11/11] qtbase-assert
@ -8,7 +8,7 @@ Subject: [PATCH 11/11] qtbase-assert
1 file changed, 5 insertions(+), 2 deletions(-) 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h
index 6498ea84..d821ced7 100644 index 6498ea84ef..d821ced7fc 100644
--- a/src/testlib/qtestassert.h --- a/src/testlib/qtestassert.h
+++ b/src/testlib/qtestassert.h +++ b/src/testlib/qtestassert.h
@@ -44,10 +44,13 @@ @@ -44,10 +44,13 @@
@ -28,5 +28,5 @@ index 6498ea84..d821ced7 100644
QT_END_NAMESPACE QT_END_NAMESPACE
-- --
2.22.1 2.23.GIT