diff options
| author | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2021-04-26 23:27:01 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@signal-slot.co.jp> | 2021-04-27 00:25:17 +0900 |
| commit | 63af385368aa722ad63ac7c2cf9d770b0e0603ee (patch) | |
| tree | f92fc5aa8aee9f27279118d8758af64357d4cdc0 /src | |
| parent | 3f16ac5588159944e6905dde6195c26c8c4421a2 (diff) | |
Fix build without features.imageformat_png
Change-Id: Idc5a1c175fa942e90830ae8b81f6627a729f7220
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/nativestyle/qstyle/qquickcommonstyle.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp index ff943c96..155915c1 100644 --- a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp +++ b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp @@ -5080,10 +5080,7 @@ static QIcon clearTextIcon(bool rtl) QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *option) const { const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QGuiApplication::isRightToLeft()); -#ifdef QT_NO_IMAGEFORMAT_PNG - Q_UNUSED(widget); - Q_UNUSED(sp); -#else +#if QT_CONFIG(imageformat_png) QPixmap pixmap; if (QGuiApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) { @@ -5257,7 +5254,7 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti if (!pixmap.isNull()) return pixmap; -#endif //QT_NO_IMAGEFORMAT_PNG +#endif // QT_CONFIG(imageformat_png) switch (sp) { #ifndef QT_NO_IMAGEFORMAT_XPM case SP_ToolBarHorizontalExtensionButton: @@ -5418,7 +5415,7 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti } #endif //QT_NO_IMAGEFORMAT_XPM -#if !QT_CONFIG(imageformat_png) && !QT_CONFIG(imageformat_xpm) && !QT_CONFIG(imageformat_png) +#if !QT_CONFIG(imageformat_png) && !QT_CONFIG(imageformat_xpm) Q_UNUSED(rtl); #endif |