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

This commit is contained in:
Will Dietz
2019-10-07 19:22:52 -05:00
parent b3594de31f
commit 35b13614b5
11 changed files with 76 additions and 71 deletions
@@ -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>
Date: Tue, 17 Sep 2019 05:37:04 -0500
Subject: [PATCH 11/11] qtbase-assert
@@ -8,7 +8,7 @@ Subject: [PATCH 11/11] qtbase-assert
1 file changed, 5 insertions(+), 2 deletions(-)
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
+++ b/src/testlib/qtestassert.h
@@ -44,10 +44,13 @@
@@ -28,5 +28,5 @@ index 6498ea84..d821ced7 100644
QT_END_NAMESPACE
--
2.22.1
2.23.GIT