diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-09 09:21:51 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-29 16:00:08 (GMT) |
| commit | a7a70ad81a9a1f3cba5fca66c232e7d8560a2850 (patch) | |
| tree | 9cd949ce8a4b2209867cb4cc30df2263b0d23467 | |
| parent | 5c4ed2858f31d6b3adcf5200c3a64fbf188a3f4d (diff) | |
| download | Qt-a7a70ad81a9a1f3cba5fca66c232e7d8560a2850.zip Qt-a7a70ad81a9a1f3cba5fca66c232e7d8560a2850.tar.gz Qt-a7a70ad81a9a1f3cba5fca66c232e7d8560a2850.tar.bz2 | |
Fix QT_NO_IMAGEFORMAT_PNG
Reviewed-by: tom
| -rw-r--r-- | src/gui/styles/qcommonstyle.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 70d130a..b08dc4b 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -5169,13 +5169,12 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *option, const QWidget *widget) const { + const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QApplication::isRightToLeft()); #ifdef QT_NO_IMAGEFORMAT_PNG - Q_UNUSED(option); Q_UNUSED(widget); Q_UNUSED(sp); #else QPixmap pixmap; - const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QApplication::isRightToLeft()); if (QApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) { switch (sp) { |