summaryrefslogtreecommitdiffstats
path: root/src/gui/styles
diff options
context:
space:
mode:
authorSami Lempinen <sami.lempinen@nokia.com>2011-08-23 11:33:16 (GMT)
committerSami Lempinen <sami.lempinen@nokia.com>2011-08-23 11:33:16 (GMT)
commita28832bb61e7e60ac0fb856daf27b78ff1728520 (patch)
treed8ecd2387568814a68bf8b8713f3abed9ff9f275 /src/gui/styles
parent59f33898919391d3aa4baa6849556965ae7d08ce (diff)
parent2f5855e8d891a7e93bdb721243f1c0b10fcb5ad9 (diff)
downloadQt-a28832bb61e7e60ac0fb856daf27b78ff1728520.zip
Qt-a28832bb61e7e60ac0fb856daf27b78ff1728520.tar.gz
Qt-a28832bb61e7e60ac0fb856daf27b78ff1728520.tar.bz2
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/gui/styles')
-rw-r--r--src/gui/styles/qmacstyle_mac.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index 8436856..1c1713c 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -1063,7 +1063,7 @@ bool qt_mac_buttonIsRenderedFlat(const QPushButton *pushButton, const QStyleOpti
{
QMacStyle *macStyle = qobject_cast<QMacStyle *>(pushButton->style());
if (!macStyle)
- return false;
+ return true; // revert to 'flat' behavior if not Mac style
HIThemeButtonDrawInfo bdi;
macStyle->d->initHIThemePushButton(option, pushButton, kThemeStateActive, &bdi);
return bdi.kind == kThemeBevelButton;