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

Fix build with -no-feature-imageformat_png

Browse Source 
Change-Id: Ib742665b2c379ff600b6a99432c89567a3f7765b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 7774c1b07936e302f15337f924874dcb63117c12)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tasuku Suzuki 2023-01-16 14:50:48 +09:00 committed by Qt Cherry-pick Bot
parent d72d38daf7
commit 0ce7784e11
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/styles/qcommonstyle.cpp
View File

@ -6394,7 +6394,6 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
addIconFiles(iconResourcePrefix() + QStringLiteral("toolbar-ext-v-"), addIconFiles(iconResourcePrefix() + QStringLiteral("toolbar-ext-v-"),
toolBarExtVSizes, sizeof(toolBarExtVSizes)/sizeof(toolBarExtVSizes[0]), icon); toolBarExtVSizes, sizeof(toolBarExtVSizes)/sizeof(toolBarExtVSizes[0]), icon);
break; break;
#endif // QT_NO_IMAGEFORMAT_PNG
case SP_TabCloseButton: case SP_TabCloseButton:
icon.addFile(iconResourcePrefix() + u"standardbutton-closetab-16.png", QSize(16, 16), icon.addFile(iconResourcePrefix() + u"standardbutton-closetab-16.png", QSize(16, 16),
QIcon::Normal, QIcon::Off); QIcon::Normal, QIcon::Off);
@ -6409,6 +6408,7 @@ QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption
icon.addFile(iconResourcePrefix() + u"standardbutton-closetab-hover-32.png", QSize(32, 32), icon.addFile(iconResourcePrefix() + u"standardbutton-closetab-hover-32.png", QSize(32, 32),
QIcon::Active, QIcon::Off); QIcon::Active, QIcon::Off);
break; break;
#endif // QT_NO_IMAGEFORMAT_PNG
default: default:
icon.addPixmap(proxy()->standardPixmap(standardIcon, option, widget)); icon.addPixmap(proxy()->standardPixmap(standardIcon, option, widget));
break; break;