From 5994def6aba46772b28650945ba7b5ea4b036cee Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 2 Apr 2024 14:21:06 +0000 Subject: [PATCH] Revert "Android: skip vulkan tests for tst_qrhiwidget" Amends feff219aadd649c41e6ed349da3a740a0a21435f which didn't really do the revert for some reason. This reverts commit bba26d72207304e02098d1436232357dd452de2a. Reason for revert: Latest emulator update fixed the issue. Change-Id: I0bc4263eae36c3ff81f235dcfe3bad9b30afd5d8 Reviewed-by: Qt CI Bot Reviewed-by: Ville Voutilainen --- tests/auto/widgets/widgets/qrhiwidget/tst_qrhiwidget.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/auto/widgets/widgets/qrhiwidget/tst_qrhiwidget.cpp b/tests/auto/widgets/widgets/qrhiwidget/tst_qrhiwidget.cpp index 7c57e77eb3..7a102180e7 100644 --- a/tests/auto/widgets/widgets/qrhiwidget/tst_qrhiwidget.cpp +++ b/tests/auto/widgets/widgets/qrhiwidget/tst_qrhiwidget.cpp @@ -70,9 +70,6 @@ void tst_QRhiWidget::testData() #endif #if QT_CONFIG(vulkan) -#if defined(Q_OS_ANDROID) - qWarning() << "Skipping Vulkan for Android (QTQAINFRA-5971)"; -#else // Have to probe to be sure Vulkan is actually working (the test cases // themselves will assume QRhi init succeeds). if (QVulkanDefaultInstance::instance()) { @@ -82,7 +79,6 @@ void tst_QRhiWidget::testData() QTest::newRow("Vulkan") << QRhiWidget::Api::Vulkan; } #endif -#endif #if QT_CONFIG(metal) QRhiMetalInitParams metalInitParams;