dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

qt5: revert mac qtbase patch to include recent change

Browse Source
This commit is contained in:
Will Dietz 2019-10-07 19:24:07 -05:00
parent 35b13614b5
commit f6e8dd8bad
No known key found for this signature in database
GPG Key ID: EBB0EA4124809D02
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
From c8ca2cd3ebd870f52a25ea7d1962df993767be5b Mon Sep 17 00:00:00 2001 From 203c9338dc92c2c36007cfe6633387348976637e 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 168e0418e4..32542c332c 100644 index f96e7358..650946b7 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
@@ -213,7 +213,7 @@ private: @@ -212,7 +212,7 @@ private:
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@ -25,7 +25,7 @@ index 168e0418e4..32542c332c 100644
QT_END_NAMESPACE QT_END_NAMESPACE
#include <os/activity.h> #include <os/activity.h>
@@ -291,7 +291,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); @@ -290,7 +290,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.GIT 2.23.0