From d0a9b93324406b18e0058db9109c8a1e7fdb02ca Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 4 Jul 2023 15:26:13 +0200 Subject: [PATCH] QFusionStyle: rename dock_widget_close_xpm to avoid clash with qcommonstylepixmaps_p.h They're different XPMs, so we can't share them. Detected by -unity-build-batch-size 103. Task-number: QTBUG-115031 Change-Id: Ifa5ce59df10883f95582aefe37e413db2e5a13f1 Reviewed-by: Volker Hilsheimer (cherry picked from commit 199a339f38ca2feda6cd1a52e895fabfc56097ed) Reviewed-by: Qt Cherry-pick Bot --- src/widgets/styles/qfusionstyle.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 64a0b3c7217..918f9dbe520 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -76,7 +76,7 @@ static const int groupBoxTopMargin = 3; #if QT_CONFIG(imageformat_xpm) /* XPM */ -static const char * const dock_widget_close_xpm[] = { +static const char * const fusion_dock_widget_close_xpm[] = { "11 13 7 1", " c None", ". c #D5CFCB", @@ -3731,7 +3731,7 @@ QIcon QFusionStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption return QIcon(QPixmap(workspace_minimize)); case SP_TitleBarCloseButton: case SP_DockWidgetCloseButton: - return QIcon(QPixmap(dock_widget_close_xpm)); + return QIcon(QPixmap(fusion_dock_widget_close_xpm)); default: break; } @@ -3753,7 +3753,7 @@ QPixmap QFusionStyle::standardPixmap(StandardPixmap standardPixmap, const QStyle return QPixmap(workspace_minimize); case SP_TitleBarCloseButton: case SP_DockWidgetCloseButton: - return QPixmap(dock_widget_close_xpm); + return QPixmap(fusion_dock_widget_close_xpm); default: break;