diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-17 10:19:31 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-17 10:34:24 +0200 |
commit | d0a0a3c0418a0fdd2ed84b2a5f7e6565537715c6 (patch) | |
tree | d6aeb4d51caf30ccf23eadb806a09295cbf679cd /tests/auto/gui/qvulkan/tst_qvulkan.cpp | |
parent | 9f405f98a4247cd263b9c5d35659a4ba89e282de (diff) | |
parent | ac35f9c44c0fb3b2f40ae5585c497200b2ba743d (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
examples/network/fortuneclient/client.cpp
examples/network/fortuneserver/server.cpp
src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h
src/plugins/platforms/cocoa/qcocoabackingstore.h
src/plugins/platforms/cocoa/qcocoaintegration.h
src/plugins/platforms/cocoa/qcocoascreen.h
src/plugins/platforms/ios/qiosbackingstore.h
src/plugins/sqldrivers/oci/qsql_oci.cpp
src/widgets/kernel/qwidgetwindow.cpp
Change-Id: Ia6dd2c52d4a691b671cf9a2ffca70deccece8f10
Diffstat (limited to 'tests/auto/gui/qvulkan/tst_qvulkan.cpp')
-rw-r--r-- | tests/auto/gui/qvulkan/tst_qvulkan.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/gui/qvulkan/tst_qvulkan.cpp b/tests/auto/gui/qvulkan/tst_qvulkan.cpp index 716d49a2f1..c80c3fed97 100644 --- a/tests/auto/gui/qvulkan/tst_qvulkan.cpp +++ b/tests/auto/gui/qvulkan/tst_qvulkan.cpp @@ -116,7 +116,7 @@ void tst_QVulkan::vulkanPlainWindow() w.setVulkanInstance(&inst); w.resize(1024, 768); w.show(); - QTest::qWaitForWindowExposed(&w); + QVERIFY(QTest::qWaitForWindowExposed(&w)); QCOMPARE(w.vulkanInstance(), &inst); @@ -182,7 +182,7 @@ void tst_QVulkan::vulkanWindow() QVERIFY(!w.isValid()); w.resize(1024, 768); w.show(); - QTest::qWaitForWindowExposed(&w); + QVERIFY(QTest::qWaitForWindowExposed(&w)); QVERIFY(!w.isValid()); // Now set it. A simple hide - show should be enough to correct, this, no @@ -194,7 +194,7 @@ void tst_QVulkan::vulkanWindow() if (pdevs.isEmpty()) QSKIP("No Vulkan physical devices; skip"); w.show(); - QTest::qWaitForWindowExposed(&w); + QVERIFY(QTest::qWaitForWindowExposed(&w)); QVERIFY(w.isValid()); QCOMPARE(w.vulkanInstance(), &inst); QVulkanInfoVector<QVulkanExtension> exts = w.supportedDeviceExtensions(); @@ -208,7 +208,7 @@ void tst_QVulkan::vulkanWindow() // supported lists can be queried before expose too QVERIFY(w.supportedDeviceExtensions() == exts); w.show(); - QTest::qWaitForWindowExposed(&w); + QVERIFY(QTest::qWaitForWindowExposed(&w)); QVERIFY(w.isValid()); QVERIFY(w.flags().testFlag(QVulkanWindow::PersistentResources)); @@ -355,7 +355,7 @@ void tst_QVulkan::vulkanWindowRenderer() w.setVulkanInstance(&inst); w.resize(1024, 768); w.show(); - QTest::qWaitForWindowExposed(&w); + QVERIFY(QTest::qWaitForWindowExposed(&w)); if (w.availablePhysicalDevices().isEmpty()) QSKIP("No Vulkan physical devices; skip"); @@ -389,7 +389,7 @@ void tst_QVulkan::vulkanWindowGrab() w.setVulkanInstance(&inst); w.resize(1024, 768); w.show(); - QTest::qWaitForWindowExposed(&w); + QVERIFY(QTest::qWaitForWindowExposed(&w)); if (w.availablePhysicalDevices().isEmpty()) QSKIP("No Vulkan physical devices; skip"); |