diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-07-06 13:24:15 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-06 13:01:37 +0200 |
| commit | e70e9f823998bcb9c06f540d72a5a0371a72330d (patch) | |
| tree | a037c655755ce8316135f7abee16eaefae951367 /src | |
| parent | e94893ddf496f3648848d0209bc5b63345411341 (diff) | |
Fix positioning when embedding native widgets such as QGLWidget
Embedding native widgets creates window before ActiveQt has a chance
to set the _q_embedded_native_parent_handle property on the window,
so embedded flag doesn't get set during window creation.
Update embedded flag also when setting window flags.
Task-number: QTBUG-26438
Change-Id: Id29d7123de81d6542dfd6471d6dba3d31bbfe2df
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 2e2ea5f854..a2a7950fad 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -1139,6 +1139,7 @@ QWindowsWindow::WindowData QWindowsWindow::setWindowFlags_sys(Qt::WindowFlags wt WindowData result = m_data; result.flags = creationData.flags; + result.embedded = creationData.embedded; setFlag(FrameDirty); return result; } |