diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:43:36 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:46:48 +0200 |
commit | 8fc4f99e468a279e6bb8442adad6b6a46d1be1c3 (patch) | |
tree | dfd0540ecac0bc86594e9e997d7e979e40dacc6d /src/plugins/platforms/windows/qwindowswindow.h | |
parent | d3921cce47f834dd37cf0bb4085ba242dbbe2412 (diff) | |
parent | f7241e8cb949ecf2d86fae2a759a8e1fdb148a26 (diff) |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: If2168c519daf45390af04af9ef9722770453a493
Diffstat (limited to 'src/plugins/platforms/windows/qwindowswindow.h')
-rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h index 4b1792859f..3b7666cf32 100644 --- a/src/plugins/platforms/windows/qwindowswindow.h +++ b/src/plugins/platforms/windows/qwindowswindow.h @@ -159,7 +159,7 @@ public: virtual QPoint mapToGlobal(const QPoint &pos) const; virtual QPoint mapFromGlobal(const QPoint &pos) const; - virtual Qt::WindowFlags setWindowFlags(Qt::WindowFlags flags); + virtual void setWindowFlags(Qt::WindowFlags flags); virtual Qt::WindowState setWindowState(Qt::WindowState state); HWND handle() const { return m_data.hwnd; } |