diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-03 15:39:04 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-05 15:59:10 +0000 |
| commit | 14dd934c3203b614e43be9fa5b17761d43092351 (patch) | |
| tree | f9027f1b1961842bb5ea2e2aa5fdc2302f3c4ad4 /src/quicktemplates2/qquickapplicationwindow.cpp | |
| parent | 6f3f262574d2bb0cf7ccd5148f29e078aef8d16a (diff) | |
Use QQuickOverlay with plain QQuickWindow
Get rid of the ugly and broken event filter approach that was used
with QQuickWindow. Create an instance of QQuickOverlay so that the
same overlay code path is used for both QQuickApplicationWindow and
plain QQuickWindow.
Task-number: QTBUG-55729
Change-Id: I6e26b19cd94a9580418912803f50c30b9dcaeedb
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickapplicationwindow.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickapplicationwindow.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp index bf903b8a..28095aa6 100644 --- a/src/quicktemplates2/qquickapplicationwindow.cpp +++ b/src/quicktemplates2/qquickapplicationwindow.cpp @@ -476,6 +476,9 @@ QQuickItem *QQuickApplicationWindow::activeFocusControl() const QQuickOverlay *QQuickApplicationWindow::overlay() const { QQuickApplicationWindowPrivate *d = const_cast<QQuickApplicationWindowPrivate *>(d_func()); + if (!d) // being deleted + return nullptr; + if (!d->overlay) { d->overlay = new QQuickOverlay(QQuickWindow::contentItem()); d->overlay->stackAfter(QQuickApplicationWindow::contentItem()); |