diff options
author | Liang Qi <liang.qi@qt.io> | 2019-06-25 15:37:01 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-06-25 15:47:42 +0200 |
commit | aedc59b1c38528f96f0e0cc51bf6c9eeca9dca28 (patch) | |
tree | 80e38cea91c93736a7d4436642dd46c8b2dd6386 /src/plugins/styles/mac/qmacstyle_mac.mm | |
parent | e3b3dbbe93dbbac196543f62b444b2c044d14907 (diff) | |
parent | f6db25962e820d7709c2f235f02893dd3edde4f4 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/corelib/io/qstorageinfo_unix.cpp
src/network/ssl/qsslsocket_openssl.cpp
Change-Id: Ibc9ce799bef62d60d616beaa9fbde8ebeadfbc20
Diffstat (limited to 'src/plugins/styles/mac/qmacstyle_mac.mm')
-rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 3542606a00..35b2fa50ac 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -2061,7 +2061,8 @@ QMacStyle::QMacStyle() Q_D(QMacStyle); // FIXME: Tie this logic into theme change, or even polish/unpolish if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMojave) { - d->appearanceObserver = QMacKeyValueObserver(NSApp, @"effectiveAppearance", [&d] { + d->appearanceObserver = QMacKeyValueObserver(NSApp, @"effectiveAppearance", [this] { + Q_D(QMacStyle); for (NSView *b : d->cocoaControls) [b release]; d->cocoaControls.clear(); |