diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:31:58 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:35:07 +0100 |
| commit | 3af9d49bb78ac56bff57d1c3867853730f97a8e1 (patch) | |
| tree | c9d6c1d1fe90dba3c788fd06795cf05a6d4ed5bb /src/plugins/platforms/android/.prev_CMakeLists.txt | |
| parent | 71436d5499a9e0355f778f47ef465486a727049d (diff) | |
| parent | c431e2d33c2b13dee8b43a08c267c20ec1ae9654 (diff) | |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Change-Id: If75ae006db6eb977cf66af4c3d36cb5c8098a1f1
Diffstat (limited to 'src/plugins/platforms/android/.prev_CMakeLists.txt')
| -rw-r--r-- | src/plugins/platforms/android/.prev_CMakeLists.txt | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt index 047abff880..4cb966004e 100644 --- a/src/plugins/platforms/android/.prev_CMakeLists.txt +++ b/src/plugins/platforms/android/.prev_CMakeLists.txt @@ -42,20 +42,15 @@ qt_add_plugin(QAndroidIntegrationPlugin INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR} ${QT_SOURCE_TREE}/src/3rdparty/android - LIBRARIES + PUBLIC_LIBRARIES Qt::AccessibilitySupportPrivate + Qt::Core Qt::CorePrivate Qt::EglSupportPrivate Qt::EventDispatcherSupportPrivate Qt::FontDatabaseSupportPrivate - Qt::GuiPrivate - PUBLIC_LIBRARIES - Qt::AccessibilitySupport - Qt::Core - Qt::EglSupport - Qt::EventDispatcherSupport - Qt::FontDatabaseSupport Qt::Gui + Qt::GuiPrivate android jnigraphics ) @@ -70,10 +65,8 @@ qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h - LIBRARIES - Qt::VulkanSupportPrivate PUBLIC_LIBRARIES - Qt::VulkanSupport + Qt::VulkanSupportPrivate ) qt_extend_target(QAndroidIntegrationPlugin CONDITION QT_FEATURE_android_style_assets |