diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-04 00:14:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-04 09:07:19 +0100 |
| commit | 57712fa583f22b3f6be63d98ab6bec3504e9a628 (patch) | |
| tree | 56297b80d42715e2eec1c5cd60d6a51d296311bc | |
| parent | 3edf2e19dc1d2f41f941291ae78bddc2b5e32e03 (diff) | |
All QWindow properties that have "window" in them have been renamed.
Depends on patch cd34da54269e6cd7fa5c18242d982736f022a14a in qtbase.
Change-Id: I166451a322e89f2e135ede581ee628550d7f05cc
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index 37e607c..aca14c3 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -1390,8 +1390,8 @@ LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM nativeResourceForWindow("handle", widgetWindow)); if (h) ::SetParent(h, that->m_hWnd); - Qt::WindowFlags flags = widgetWindow->windowFlags(); - widgetWindow->setWindowFlags(flags | Qt::FramelessWindowHint); + Qt::WindowFlags flags = widgetWindow->flags(); + widgetWindow->setFlags(flags | Qt::FramelessWindowHint); } } that->qt.widget->raise(); |