diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-07-04 15:26:13 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-07-05 01:25:54 +0200 |
| commit | 199a339f38ca2feda6cd1a52e895fabfc56097ed (patch) | |
| tree | 478c57c7339231261120038397bd942205bcc48c /src/widgets/styles/qfusionstyle.cpp | |
| parent | 7c6be5e884db0be343fe767683c6b0a8c194ce45 (diff) | |
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
Pick-to: 6.6 6.5
Change-Id: Ifa5ce59df10883f95582aefe37e413db2e5a13f1
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/widgets/styles/qfusionstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qfusionstyle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index 64a0b3c721..918f9dbe52 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; |