diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 226da495f43..353fd68adfa 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -2009,17 +2009,6 @@ QMacStyle::QMacStyle() for (const auto &o : QMacStylePrivate::scrollBars) QCoreApplication::sendEvent(o, &event); }); - - Q_D(QMacStyle); - // FIXME: Tie this logic into theme change, or even polish/unpolish - if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSMojave) { - d->appearanceObserver = QMacKeyValueObserver(NSApp, @"effectiveAppearance", [this] { - Q_D(QMacStyle); - for (NSView *b : d->cocoaControls) - [b release]; - d->cocoaControls.clear(); - }); - } } QMacStyle::~QMacStyle() @@ -2028,6 +2017,10 @@ QMacStyle::~QMacStyle() void QMacStyle::polish(QPalette &) { + Q_D(QMacStyle); + for (NSView *b : d->cocoaControls) + [b release]; + d->cocoaControls.clear(); } void QMacStyle::polish(QApplication *) diff --git a/src/plugins/styles/mac/qmacstyle_mac_p_p.h b/src/plugins/styles/mac/qmacstyle_mac_p_p.h index 0dcfce2f0ca..798d7c38b7b 100644 --- a/src/plugins/styles/mac/qmacstyle_mac_p_p.h +++ b/src/plugins/styles/mac/qmacstyle_mac_p_p.h @@ -263,7 +263,6 @@ public: std::optional smallSystemFont; - QMacKeyValueObserver appearanceObserver; }; QT_END_NAMESPACE