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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 2335870ea7..f3830eb962 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -1178,7 +1178,7 @@ void QWindowsWindow::setWindowTitle(const QString &title) SetWindowText(m_data.hwnd, (const wchar_t*)title.utf16()); } -Qt::WindowFlags QWindowsWindow::setWindowFlags(Qt::WindowFlags flags) +void QWindowsWindow::setWindowFlags(Qt::WindowFlags flags) { if (QWindowsContext::verboseWindows) qDebug() << '>' << __FUNCTION__ << this << window() << "\n from: " @@ -1202,7 +1202,6 @@ Qt::WindowFlags QWindowsWindow::setWindowFlags(Qt::WindowFlags flags) qDebug() << '<' << __FUNCTION__ << "\n returns: " << QWindowsWindow::debugWindowFlags(m_data.flags) << " geometry " << oldGeometry << "->" << newGeometry; - return m_data.flags; } QWindowsWindow::WindowData QWindowsWindow::setWindowFlags_sys(Qt::WindowFlags wt, |