summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms/android')
-rw-r--r--src/plugins/platforms/android/.prev_CMakeLists.txt18
-rw-r--r--src/plugins/platforms/android/CMakeLists.txt11
2 files changed, 14 insertions, 15 deletions
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
+)