From ff97e083ed4dd233f499f72da4ed83e3a7f2b380 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 24 Jul 2020 14:53:38 +0200 Subject: Windows QPA: Move window properties to the new interfaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Affects the custom margin used by QWizard. Task-number: QTBUG-83252 Change-Id: Iffda043f106282f682e119ec955fa2b2eb0f259e Reviewed-by: Tor Arne Vestbø --- src/plugins/platforms/windows/qwindowswindow.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/plugins/platforms/windows/qwindowswindow.h') diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h index 6c6c86ef47..beed3e17df 100644 --- a/src/plugins/platforms/windows/qwindowswindow.h +++ b/src/plugins/platforms/windows/qwindowswindow.h @@ -144,6 +144,9 @@ public: void setHasBorderInFullScreen(bool border) override; bool hasBorderInFullScreen() const override; + QMargins customMargins() const override; + void setCustomMargins(const QMargins &margins) override; + using QPlatformWindow::screenForGeometry; virtual HWND handle() const = 0; @@ -304,8 +307,8 @@ public: QWindowsMenuBar *menuBar() const; void setMenuBar(QWindowsMenuBar *mb); - QMargins customMargins() const { return m_data.customMargins; } - void setCustomMargins(const QMargins &m); + QMargins customMargins() const override { return m_data.customMargins; } + void setCustomMargins(const QMargins &m) override; void setStyle(unsigned s) const; void setExStyle(unsigned s) const; -- cgit v1.2.3