From 77771116a4d43e4832494785bc0abde8f3d8fd58 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 29 May 2020 18:07:31 +0200 Subject: CMake: Regenerate src/plugins Change-Id: Icceceeb42023e7fa5edf320bb21f03d11bd357b7 Reviewed-by: Joerg Bornemann --- src/plugins/platforms/android/.prev_CMakeLists.txt | 18 ++++++++---------- src/plugins/platforms/android/CMakeLists.txt | 11 ++++++----- 2 files changed, 14 insertions(+), 15 deletions(-) (limited to 'src/plugins/platforms/android') diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index 4f066771d8..c18719ec72 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -61,17 +61,9 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan - SOURCES - qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h - qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h - PUBLIC_LIBRARIES - Qt::VulkanSupportPrivate -) - -qt_extend_target(QAndroidIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSupportPrivate +qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES - Qt::PlatformCompositorSupportPrivate + Qt::OpenGLPrivate ) qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets @@ -83,3 +75,9 @@ qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_styl SOURCES extract-dummy.cpp ) + +qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan + SOURCES + qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h + qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h +) diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 3d61c1e959..5c754a9202 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -70,11 +70,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin ## Scopes: ##################################################################### -qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan - SOURCES - qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h - qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h -) qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_opengl PUBLIC_LIBRARIES @@ -90,3 +85,9 @@ qt_extend_target(QAndroidIntegrationPlugin CONDITION NOT QT_FEATURE_android_styl SOURCES extract-dummy.cpp ) + +qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan + SOURCES + qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h + qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h +) -- cgit v1.2.3