diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-21 00:00:09 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-21 00:00:09 (GMT) |
| commit | 0c8816af6498d6cda60e6c8687494af5b2f4942d (patch) | |
| tree | 807b74c1e131eb35208662a52cc8a7e20bf8dd21 | |
| parent | 43f9606dc7a9937f58eba2558a3a13e3f19adfa6 (diff) | |
| parent | 538e7b8ddf45936bb274ed3230b591b3459edfa7 (diff) | |
| download | Qt-0c8816af6498d6cda60e6c8687494af5b2f4942d.zip Qt-0c8816af6498d6cda60e6c8687494af5b2f4942d.tar.gz Qt-0c8816af6498d6cda60e6c8687494af5b2f4942d.tar.bz2 | |
Merge branch 'master-upstream' into master-water
| -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 3a05f40..a05ec6b 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); } |