diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-09-21 13:55:25 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-09-21 21:39:35 +0000 |
| commit | aae5b793666091a780e63b68b2a0426f8edd6174 (patch) | |
| tree | dc45dc3dca56b30360c733a1d36c7bfcb8d6ef0b /tests | |
| parent | 3ed4944a7e21191ee726ca31c4e50bd055f9d25b (diff) | |
Make ApplicationWindow.overlay attached property work with QML Window
Since 14dd934c, we're using QQuickOverlay even with plain QML Window.
Now that the overlay is guaranteed to always exist, we can make the
attached property to give a reliable access to the overlay.
Change-Id: I707fc52f6dfc7a0dbc9a3467646fb5feb36b9572
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/applicationwindow/tst_applicationwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/applicationwindow/tst_applicationwindow.cpp index 02528fdc..2f91f664 100644 --- a/tests/auto/applicationwindow/tst_applicationwindow.cpp +++ b/tests/auto/applicationwindow/tst_applicationwindow.cpp @@ -318,7 +318,7 @@ void tst_applicationwindow::attachedProperties() QVERIFY(!childWindowControl->property("attached_activeFocusControl").value<QQuickItem *>()); QVERIFY(!childWindowControl->property("attached_header").value<QQuickItem *>()); QVERIFY(!childWindowControl->property("attached_footer").value<QQuickItem *>()); - QVERIFY(!childWindowControl->property("attached_overlay").value<QQuickItem *>()); + QCOMPARE(childWindowControl->property("attached_overlay").value<QQuickItem *>(), QQuickOverlay::overlay(childWindow)); QQuickItem *childWindowItem = object->property("childWindowItem").value<QQuickItem *>(); QVERIFY(childWindowItem); @@ -327,7 +327,7 @@ void tst_applicationwindow::attachedProperties() QVERIFY(!childWindowItem->property("attached_activeFocusControl").value<QQuickItem *>()); QVERIFY(!childWindowItem->property("attached_header").value<QQuickItem *>()); QVERIFY(!childWindowItem->property("attached_footer").value<QQuickItem *>()); - QVERIFY(!childWindowItem->property("attached_overlay").value<QQuickItem *>()); + QCOMPARE(childWindowItem->property("attached_overlay").value<QQuickItem *>(), QQuickOverlay::overlay(childWindow)); QObject *childWindowObject = object->property("childWindowObject").value<QObject *>(); QVERIFY(childWindowObject); |