From 4c181899d4e4c41770825ac2c4812b01ac807468 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Tue, 18 Aug 2020 20:11:13 +0200 Subject: 20200818.1 global branch merge. Signed-off-by: Matteo Bernardini --- libraries/PyQt5/patches/pyqt5-python2-crash.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 libraries/PyQt5/patches/pyqt5-python2-crash.patch (limited to 'libraries/PyQt5/patches/pyqt5-python2-crash.patch') diff --git a/libraries/PyQt5/patches/pyqt5-python2-crash.patch b/libraries/PyQt5/patches/pyqt5-python2-crash.patch deleted file mode 100644 index 14462f7563..0000000000 --- a/libraries/PyQt5/patches/pyqt5-python2-crash.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in ---- PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in 2019-06-25 14:41:02.000000000 +0200 -+++ PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in 2019-07-01 17:06:34.882644535 +0200 -@@ -151,8 +151,4 @@ - // initialised first (at least for Windows) and this is the only way to - // guarantee things are done in the right order. - PyQtSlotProxy::mutex = new QMutex(QMutex::Recursive); -- -- // Load the embedded qt.conf file if there is a bundled copy of Qt. -- if (!qpycore_qt_conf()) -- Py_FatalError("PyQt5.QtCore: Unable to embed qt.conf"); - } - -- cgit v1.2.3