diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-20 00:38:45 +0100 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-20 00:38:45 +0100 |
| commit | 538e7b8ddf45936bb274ed3230b591b3459edfa7 (patch) | |
| tree | 4af2f093f77b35405a1a90e87eaa737cc1dbebbe | |
| parent | 530c0a32bf58b382c32806bb6742b6029086c92e (diff) | |
| parent | 2fcdebe9c716f3b7012f9da4617f419ab32150a6 (diff) | |
| download | qt4-tools-538e7b8ddf45936bb274ed3230b591b3459edfa7.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QTBUG-4201 fixed
| -rw-r--r-- | src/gui/styles/qmacstyle_mac.mm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 3a05f40ba7..a05ec6bd24 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -1948,10 +1948,9 @@ void QMacStyle::unpolish(QWidget* w) rubber->setAttribute(Qt::WA_NoSystemBackground, true); } - if (QFocusFrame *frame = qobject_cast<QFocusFrame *>(w)) { + if (QFocusFrame *frame = qobject_cast<QFocusFrame *>(w)) frame->setAttribute(Qt::WA_NoSystemBackground, true); - frame->setAutoFillBackground(true); - } + QWindowsStyle::unpolish(w); } |