diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-10-30 13:18:43 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2009-10-30 13:50:14 (GMT) |
| commit | 157e218d90ba832b2846889e9f7c94c95ed2cfbc (patch) | |
| tree | f56572c6edf7cab5c8d09ddb8d86b23b45900cf8 /src | |
| parent | 30b0902cf05b0c1dc649e9c2e7ae0415e0c1d042 (diff) | |
| download | Qt-157e218d90ba832b2846889e9f7c94c95ed2cfbc.zip Qt-157e218d90ba832b2846889e9f7c94c95ed2cfbc.tar.gz Qt-157e218d90ba832b2846889e9f7c94c95ed2cfbc.tar.bz2 | |
Fix issue with wrong QMessagebox icons on Mac.
Task: QTBUG-4988
68c0e6a8ba1e92bf0152adcaa86eebb83dcfd1d8 introduced
a regression preventing the mac-spesific standardIcon
code form being called.
Call the Mac code if desktopSettingsAware is set.
(QIcon::themeName() is only set on X11)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/styles/qcommonstyle.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 70d130a..1564a3f 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -5657,10 +5657,11 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons default: break; } - + } // if (QApplication::desktopSettingsAware() && !QIcon::themeName().isEmpty()) if (!icon.isNull()) return icon; #if defined(Q_WS_MAC) + if (QApplication::desktopSettingsAware()) { OSType iconType = 0; switch (standardIcon) { case QStyle::SP_MessageBoxQuestion: @@ -5751,8 +5752,8 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons ReleaseIconRef(overlayIcon); return retIcon; } + } // if (QApplication::desktopSettingsAware()) #endif // Q_WS_MAC - } switch (standardIcon) { #ifndef QT_NO_IMAGEFORMAT_PNG |