Salome HOME
Ensure cmake_build_type is used in SALOME 9.12.0
[tools/sat_salome.git] / products / patches / pyqt-5.15.3-qpycore-init-pyqtparaview.patch
1 diff -Naur PyQt5-5.15.3_init/qpy/QtCore/qpycore_init.cpp PyQt5-5.15.3/qpy/QtCore/qpycore_init.cpp
2 --- PyQt5-5.15.3_init/qpy/QtCore/qpycore_init.cpp       2022-11-17 13:26:26.311645609 +0100
3 +++ PyQt5-5.15.3/qpy/QtCore/qpycore_init.cpp    2022-11-17 13:36:32.687598350 +0100
4 @@ -28,6 +28,8 @@
5  #include "sipAPIQtCore.h"
6  
7  #include <QCoreApplication>
8 +#include <QProcessEnvironment>
9 +#include <QString>
10  
11  
12  // Set if any QCoreApplication (or sub-class) instance was created from Python.
13 @@ -45,11 +47,13 @@
14      if (qpycore_created_qapp)
15      {
16          QCoreApplication *app = QCoreApplication::instance();
17 -
18 +        QProcessEnvironment pe(QProcessEnvironment::systemEnvironment());
19 +        QString pyqt5_not_master("PYQT5_NOT_MASTER");
20          if (app)
21          {
22              Py_BEGIN_ALLOW_THREADS
23 -            delete app;
24 +            if( !pe.contains(pyqt5_not_master) || pe.value(pyqt5_not_master).isEmpty() )
25 +              delete app;
26              Py_END_ALLOW_THREADS
27          }
28      }