From a84fbebc64d392061c319ffc72d1be967b5c6b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristi=C3=A1n=20Maureira-Fredes?= Date: Thu, 8 Feb 2024 09:01:32 +0100 Subject: build: undef slots to avoid conflict with qt in designercustomwidgets While using unity builds, the 'slots' definition seems to come before the Python.h include. Change-Id: I6ff147874fcad31b02438190c44cd70a8e573a1c Reviewed-by: Friedemann Kleint (cherry picked from commit b7112652408c2e2bb45be5f3f80cd6f6eb2026d4) Reviewed-by: Qt Cherry-pick Bot --- sources/pyside6/plugins/designer/designercustomwidgets.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/pyside6/plugins/designer/designercustomwidgets.cpp b/sources/pyside6/plugins/designer/designercustomwidgets.cpp index 6491251b9..ccff635a9 100644 --- a/sources/pyside6/plugins/designer/designercustomwidgets.cpp +++ b/sources/pyside6/plugins/designer/designercustomwidgets.cpp @@ -1,6 +1,7 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +#undef slots #include // Include before Qt headers due to 'slots' macro definition #include "designercustomwidgets.h" -- cgit v1.2.3