1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFusionStyle: rename dock_widget_close_xpm to avoid clash with qcommonstylepixmaps_p.h

Browse Source 
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 <volker.hilsheimer@qt.io>
(cherry picked from commit 199a339f38ca2feda6cd1a52e895fabfc56097ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-07-04 15:26:13 +02:00 committed by Qt Cherry-pick Bot
parent 78a45e4a65
commit d0a9b93324
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/styles/qfusionstyle.cpp
View File

@ -76,7 +76,7 @@ static const int groupBoxTopMargin = 3;
#if QT_CONFIG(imageformat_xpm) #if QT_CONFIG(imageformat_xpm)
/* XPM */ /* XPM */
static const char * const dock_widget_close_xpm[] = { static const char * const fusion_dock_widget_close_xpm[] = {
"11 13 7 1", "11 13 7 1",
" c None", " c None",
". c #D5CFCB", ". c #D5CFCB",
@ -3731,7 +3731,7 @@ QIcon QFusionStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
return QIcon(QPixmap(workspace_minimize)); return QIcon(QPixmap(workspace_minimize));
case SP_TitleBarCloseButton: case SP_TitleBarCloseButton:
case SP_DockWidgetCloseButton: case SP_DockWidgetCloseButton:
return QIcon(QPixmap(dock_widget_close_xpm)); return QIcon(QPixmap(fusion_dock_widget_close_xpm));
default: default:
break; break;
} }
@ -3753,7 +3753,7 @@ QPixmap QFusionStyle::standardPixmap(StandardPixmap standardPixmap, const QStyle
return QPixmap(workspace_minimize); return QPixmap(workspace_minimize);
case SP_TitleBarCloseButton: case SP_TitleBarCloseButton:
case SP_DockWidgetCloseButton: case SP_DockWidgetCloseButton:
return QPixmap(dock_widget_close_xpm); return QPixmap(fusion_dock_widget_close_xpm);
default: default:
break; break;