diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-28 16:33:52 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 09:05:29 +0100 |
| commit | 56fcaf36e8e3197e4394522e7ab6d74317d24c99 (patch) | |
| tree | f791d363d59334265c09b53d4166ffc433871cc8 | |
| parent | e63eceabc43d273641e9239e6dfcc60e2f8aeec7 (diff) | |
Set window flags correctly.
Change-Id: Ia1952c0493319471cc427df884680087114fe65c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index 58b4193..7d1cfe9 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -1391,7 +1391,7 @@ LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM if (h) ::SetParent(h, that->m_hWnd); Qt::WindowFlags flags = widgetWindow->windowFlags(); - widgetWindow->setWindowFlags(Qt::FramelessWindowHint); + widgetWindow->setWindowFlags(flags | Qt::FramelessWindowHint); } } that->qt.widget->raise(); |