From 604ace00957d7dfd8029932c529a59810485163e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Fri, 28 Jan 2022 11:08:14 +0100 Subject: Widgets: Do not include qundogroup.h, qundostack.h in QtWidgets header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The headers are already included in QtGui/QtGui. This also fixes an issue when compiling with the respective features disabled. Pick-to: 6.2 6.3 Fixes: QTBUG-100290 Change-Id: I5e7c6578952535315bacde218a26d2133c486b2c Reviewed-by: Jörg Bornemann Reviewed-by: Fabian Kosmale --- src/widgets/util/qundogroup.h | 5 +++++ src/widgets/util/qundostack.h | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/widgets/util/qundogroup.h b/src/widgets/util/qundogroup.h index a3254bcdbc..e8b39dd883 100644 --- a/src/widgets/util/qundogroup.h +++ b/src/widgets/util/qundogroup.h @@ -37,6 +37,11 @@ ** ****************************************************************************/ +#if 0 +// syncqt: header is already part of QtGui/QtGui +#pragma qt_no_master_include +#endif + #include QT_BEGIN_NAMESPACE diff --git a/src/widgets/util/qundostack.h b/src/widgets/util/qundostack.h index f520ab6f95..ddb65af451 100644 --- a/src/widgets/util/qundostack.h +++ b/src/widgets/util/qundostack.h @@ -37,6 +37,11 @@ ** ****************************************************************************/ +#if 0 +// syncqt: header is already part of QtGui/QtGui +#pragma qt_no_master_include +#endif + #include QT_BEGIN_NAMESPACE -- cgit v1.2.3