diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-08-17 14:19:36 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-20 10:48:09 +0200 |
| commit | 333f641622c795a4b826d2d48aeabd5b5eab6e90 (patch) | |
| tree | a178ae15e995668d3f4959503983a4da449d91a7 /src/gui/kernel/qplatformwindow.h | |
| parent | 9ea9ec1cbb567197ce0bf44ea58a79308c9b64d8 (diff) | |
Fix in-process QAxServers inside modal windows.
The main window of in-process QAxServers doesn't have QWindow parent,
but it does have native parent that is part of the native window tree
of the application. The lack of Qt parent makes embedded controls look
like toplevel windows, which causes problems e.g. with modality.
Introduced new optional method QPlatformWindow::isEmbedded() to
detect if a window is an embedded window and utilized it in proper
places during modality handling.
Task-number: QTBUG-26871
Change-Id: Iac9a51dae06b8fc15410de7838857e203e4275b8
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/gui/kernel/qplatformwindow.h')
| -rw-r--r-- | src/gui/kernel/qplatformwindow.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformwindow.h b/src/gui/kernel/qplatformwindow.h index a6a519e6fd..e27851830e 100644 --- a/src/gui/kernel/qplatformwindow.h +++ b/src/gui/kernel/qplatformwindow.h @@ -103,6 +103,7 @@ public: virtual bool isExposed() const; virtual bool isActive() const; + virtual bool isEmbedded(const QPlatformWindow *parentWindow) const; virtual void propagateSizeHints(); |