]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
Fix qt 5.15.2 compilation on CO9
authorGuytri KASTANE <guytri.kastane@cea.fr>
Thu, 20 Jun 2024 07:09:49 +0000 (09:09 +0200)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Thu, 20 Jun 2024 09:29:25 +0000 (11:29 +0200)
products/patches/qt_5_15_2_numeric_limits.patch [new file with mode: 0644]

diff --git a/products/patches/qt_5_15_2_numeric_limits.patch b/products/patches/qt_5_15_2_numeric_limits.patch
new file mode 100644 (file)
index 0000000..d2a0ce5
--- /dev/null
@@ -0,0 +1,33 @@
+diff -Naur qt_ref/qtbase/src/corelib/global/qendian.h qt/qtbase/src/corelib/global/qendian.h
+--- qt_ref/qtbase/src/corelib/global/qendian.h 2024-06-20 08:48:35.275042443 +0200
++++ qt/qtbase/src/corelib/global/qendian.h     2024-06-19 09:26:15.988364209 +0200
+@@ -47,6 +47,7 @@
+ // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
+ #include <stdlib.h>
+ #include <string.h>
++#include <limits>
+ #ifdef min // MSVC
+ #undef min
+diff -Naur qt_ref/qtbase/src/corelib/global/qfloat16.h qt/qtbase/src/corelib/global/qfloat16.h
+--- qt_ref/qtbase/src/corelib/global/qfloat16.h        2024-06-20 08:48:35.275042443 +0200
++++ qt/qtbase/src/corelib/global/qfloat16.h    2024-06-19 09:26:58.829940099 +0200
+@@ -44,6 +44,7 @@
+ #include <QtCore/qglobal.h>
+ #include <QtCore/qmetatype.h>
+ #include <string.h>
++#include <limits>
+ #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
+ // All processors that support AVX2 do support F16C too. That doesn't mean
+diff -Naur qt_ref/qtbase/src/corelib/text/qbytearraymatcher.h qt/qtbase/src/corelib/text/qbytearraymatcher.h
+--- qt_ref/qtbase/src/corelib/text/qbytearraymatcher.h 2024-06-20 08:48:35.298042763 +0200
++++ qt/qtbase/src/corelib/text/qbytearraymatcher.h     2024-06-19 09:29:34.864037490 +0200
+@@ -41,6 +41,7 @@
+ #define QBYTEARRAYMATCHER_H
+ #include <QtCore/qbytearray.h>
++#include <limits>
+ QT_BEGIN_NAMESPACE