From f02dde3d74ec69d2bafa25053ff85e514d950b0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 13 May 2020 17:53:39 +0200 Subject: Simplify QMainWindow::setUnifiedTitleAndToolBarOnMac Task-number: QTBUG-83252 Change-Id: Ib6f7dcfe21407603d4cfd5d33f6615d8623db940 Reviewed-by: Volker Hilsheimer --- src/plugins/platforms/cocoa/qcocoawindow.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/cocoa/qcocoawindow.h') diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index e4debd669d..0c607320f8 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -98,7 +98,8 @@ class QDebug; class QCocoaMenuBar; -class QCocoaWindow : public QObject, public QPlatformWindow +class QCocoaWindow : public QObject, public QPlatformWindow, + public QPlatformInterface::Private::QCocoaWindow { Q_OBJECT public: @@ -192,7 +193,7 @@ public: void setContentBorderThickness(int topThickness, int bottomThickness); void registerContentBorderArea(quintptr identifier, int upper, int lower); void setContentBorderAreaEnabled(quintptr identifier, bool enable); - void setContentBorderEnabled(bool enable); + void setContentBorderEnabled(bool enable) override; bool testContentBorderAreaPosition(int position) const; void applyContentBorderThickness(NSWindow *window = nullptr); void updateNSToolbar(); -- cgit v1.2.3