From 1262312566788fba5d83147981e2f51fe1bfa52c Mon Sep 17 00:00:00 2001 From: Amir Masoud Abdol Date: Thu, 20 Apr 2023 09:05:30 +0200 Subject: [PATCH] Exclude Android Vulkan sources from Unity Build If not excluded, `VK_USE_PLATFORM_ANDROID_KHR` might end up being undefined due to the order of includes. Task-number: QTBUG-109394 Change-Id: Ib7bbf42af319568bc39db0b9e5c796d25db3c364 Reviewed-by: Alexandru Croitor (cherry picked from commit 972d602ee62421726abfefad4d6d9057c136570b) Reviewed-by: Qt Cherry-pick Bot --- src/plugins/platforms/android/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 632b1c1d424..d2edcae67ff 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -87,4 +87,7 @@ qt_internal_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h + NO_UNITY_BUILD_SOURCES + # To avoid undefined symbols due to missing VK_USE_PLATFORM_ANDROID_KHR + qandroidplatformvulkaninstance.cpp qandroidplatformvulkanwindow.cpp )