diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2024-02-08 09:01:32 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-08 10:18:46 +0000 |
| commit | a84fbebc64d392061c319ffc72d1be967b5c6b97 (patch) | |
| tree | 1d88f52fd50dd2abfd662bb0afe242e135f7e523 | |
| parent | bb0247bdf1be054f13c94a4c8bac36d294783b6c (diff) | |
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 <Friedemann.Kleint@qt.io>
(cherry picked from commit b7112652408c2e2bb45be5f3f80cd6f6eb2026d4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | sources/pyside6/plugins/designer/designercustomwidgets.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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 <Python.h> // Include before Qt headers due to 'slots' macro definition #include "designercustomwidgets.h" |