aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-08-01 10:39:50 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-08-01 11:46:32 +0000
commitbefcade3bf9a699d0594db4efb4301a8cb81e599 (patch)
treea0d463a5e5150b57a0b900d9db73a0b979c92679
parent8bb8588c3627515fa914e33db0199aee3300e1fd (diff)
Fix build error on Windows caused by macro copysign in CPython
Remove the define, fixing: qjsprimitivevalue.h(805): error C2039: '_copysign': is not a member of 'std' Change-Id: Iad9b467decc81a3eed534f49d26e30237eef23de Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com> (cherry picked from commit 9aa0225352cada0c7957f4310b9be9d3d0922f56) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/pyside6/libpysideqml/pysideqmlmetacallerror.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/sources/pyside6/libpysideqml/pysideqmlmetacallerror.cpp b/sources/pyside6/libpysideqml/pysideqmlmetacallerror.cpp
index e96e7a707..58a5c0916 100644
--- a/sources/pyside6/libpysideqml/pysideqmlmetacallerror.cpp
+++ b/sources/pyside6/libpysideqml/pysideqmlmetacallerror.cpp
@@ -43,6 +43,12 @@
#include <sbkstring.h>
#include <autodecref.h>
+// Remove deprecated MACRO of copysign for MSVC #86286
+// https://github.com/python/cpython/issues/86286
+#ifdef copysign
+# undef copysign
+#endif
+
#include <QtCore/QObject>
#include <QtCore/QString>