diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-11 01:01:10 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-06-11 11:28:44 +0200 |
| commit | 10e3b24c02cd1c22c7df0f350f229625e13faeae (patch) | |
| tree | e9f02181e47156e9c8652e0c5dba15bbdcb97e5a /tests/auto/quick/scenegraph | |
| parent | 8733a8762c2db473d3a39d1f01c09156c04e3772 (diff) | |
| parent | ac402fa6d99eeb519a9cc23b028358dfb6df4d82 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/qml/jsruntime/qv4value_p.h
src/qml/qml/qqmlmetatype.cpp
src/qml/qml/qqmltypewrapper.cpp
src/quick/items/qquicktableview.cpp
Change-Id: I684f8e01a711580512848bf1253f39b39fcbf4c7
Diffstat (limited to 'tests/auto/quick/scenegraph')
| -rw-r--r-- | tests/auto/quick/scenegraph/tst_scenegraph.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/quick/scenegraph/tst_scenegraph.cpp b/tests/auto/quick/scenegraph/tst_scenegraph.cpp index 063358c795..b4abdd6fe2 100644 --- a/tests/auto/quick/scenegraph/tst_scenegraph.cpp +++ b/tests/auto/quick/scenegraph/tst_scenegraph.cpp @@ -564,7 +564,10 @@ bool tst_SceneGraph::isRunningOnOpenGL() bool retval = false; QQuickView dummy; dummy.show(); - QTest::qWaitForWindowExposed(&dummy); + if (!QTest::qWaitForWindowExposed(&dummy)) { + [](){ QFAIL("Could not show a QQuickView"); }(); + return false; + } if (dummy.rendererInterface()->graphicsApi() == QSGRendererInterface::OpenGL) retval = true; dummy.hide(); |