diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2017-02-13 16:54:24 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2017-02-15 09:46:39 +0000 |
| commit | ac5a6f9ed06b98aa63981dd5d30e0febf36010d8 (patch) | |
| tree | 152b4203c15a1046981fcb927af3c03ca8e9f86d /tests | |
| parent | 5f8e4afbba49c49d6e81b02d74505effc7b949ec (diff) | |
Fix crashes in removeFromCanvas
After reparenting the view, the compositor data may still be the
same, but the node might be a different one. Check if the list of
scene graph nodes is empty when making the decision on whether to
build a new node tree or not. Also advance the node iterator for
missing render passes.
Task-number: QTBUG-58472
Change-Id: I28dfb40bda89470c7cdaec0aef8a976e307f5b6a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index 8df84e048..dcc2c4f5e 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -279,10 +279,6 @@ void tst_QQuickWebEngineView::showWebEngineView() void tst_QQuickWebEngineView::removeFromCanvas() { -#ifdef Q_OS_LINUX - QSKIP("QTBUG-58472 - crashes on some linux CI"); -#else - showWebEngineView(); // This should not crash. @@ -293,7 +289,6 @@ void tst_QQuickWebEngineView::removeFromCanvas() webEngineView()->setParentItem(parent); webEngineView()->setVisible(true); QTest::qWait(200); -#endif } void tst_QQuickWebEngineView::multipleWebEngineViewWindows() |