diff options
| author | Will Dietz <w@wdtz.org> | 2019-10-07 19:24:07 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-10-07 19:24:07 -0500 |
| commit | f6e8dd8bad6348a625aa3985e941113c1f9c8bd6 (patch) | |
| tree | 4e1f43e9e6cf561d1ee57157c216bf517198ae8d /pkgs/development/libraries/qt-5 | |
| parent | 35b13614b55163c2442b21e83d5b5073df0185e3 (diff) | |
| download | nixpkgs-f6e8dd8bad6348a625aa3985e941113c1f9c8bd6.tar nixpkgs-f6e8dd8bad6348a625aa3985e941113c1f9c8bd6.tar.gz nixpkgs-f6e8dd8bad6348a625aa3985e941113c1f9c8bd6.tar.bz2 nixpkgs-f6e8dd8bad6348a625aa3985e941113c1f9c8bd6.tar.lz nixpkgs-f6e8dd8bad6348a625aa3985e941113c1f9c8bd6.tar.xz nixpkgs-f6e8dd8bad6348a625aa3985e941113c1f9c8bd6.tar.zst nixpkgs-f6e8dd8bad6348a625aa3985e941113c1f9c8bd6.zip | |
qt5: revert mac qtbase patch to include recent change
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch index f28a0e6f847..301ac67d8d0 100644 --- a/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch +++ b/pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch @@ -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> Date: Tue, 17 Sep 2019 05:37:15 -0500 Subject: [PATCH 02/11] qtbase-mac @@ -13,10 +13,10 @@ Subject: [PATCH 02/11] qtbase-mac 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 -index 168e0418e4..32542c332c 100644 +index f96e7358..650946b7 100644 --- a/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 #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(); @@ -112,5 +112,5 @@ index e63e89a7..213b6945 100644 #endif #if defined(HAVE_XCTEST) -- -2.23.GIT +2.23.0 |