diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-13 17:53:39 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-06 15:48:23 +0200 |
| commit | f02dde3d74ec69d2bafa25053ff85e514d950b0e (patch) | |
| tree | 51f3ab15414e3d7642f3d2ecd59b2deb92298eb9 /src/plugins/platforms/cocoa/qcocoawindow.h | |
| parent | 04739ce4b401bdfe766e64deac1bb382ddd954cc (diff) | |
Simplify QMainWindow::setUnifiedTitleAndToolBarOnMac
Task-number: QTBUG-83252
Change-Id: Ib6f7dcfe21407603d4cfd5d33f6615d8623db940
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 5 |
1 files changed, 3 insertions, 2 deletions
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(); |