summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2019-10-08 11:24:30 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2019-10-08 16:28:55 +0000
commit874fab1eea7f2924e74fef15ca8d6048a6303e67 (patch)
treedeb53ef071ed53bb5bc5dff55e132fca9eeb5b36 /src/plugins
parent48047d4f10d2bbae143a5e0d151b88e77174a981 (diff)
Regenerate platforms plugins part 4
Change-Id: I75d011fe040b96fd15b21476aeac78d8fd9ced77 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforms/android/.prev_CMakeLists.txt91
-rw-r--r--src/plugins/platforms/android/CMakeLists.txt5
2 files changed, 93 insertions, 3 deletions
diff --git a/src/plugins/platforms/android/.prev_CMakeLists.txt b/src/plugins/platforms/android/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..214576b6df
--- /dev/null
+++ b/src/plugins/platforms/android/.prev_CMakeLists.txt
@@ -0,0 +1,91 @@
+# Generated from android.pro.
+
+#####################################################################
+## qtforandroid Plugin:
+#####################################################################
+
+add_qt_plugin(qtforandroid
+ TYPE platforms
+ OUTPUT_DIRECTORY "$$DESTDIR/android"
+ SOURCES
+ androidcontentfileengine.cpp androidcontentfileengine.h
+ androiddeadlockprotector.cpp androiddeadlockprotector.h
+ androidjniaccessibility.cpp androidjniaccessibility.h
+ androidjniclipboard.cpp androidjniclipboard.h
+ androidjniinput.cpp androidjniinput.h
+ androidjnimain.cpp androidjnimain.h
+ androidjnimenu.cpp androidjnimenu.h
+ androidplatformplugin.cpp
+ androidsurfaceclient.h
+ qandroidassetsfileenginehandler.cpp qandroidassetsfileenginehandler.h
+ qandroideventdispatcher.cpp qandroideventdispatcher.h
+ qandroidinputcontext.cpp qandroidinputcontext.h
+ qandroidplatformaccessibility.cpp qandroidplatformaccessibility.h
+ qandroidplatformbackingstore.cpp qandroidplatformbackingstore.h
+ qandroidplatformclipboard.cpp qandroidplatformclipboard.h
+ qandroidplatformdialoghelpers.cpp qandroidplatformdialoghelpers.h
+ qandroidplatformfiledialoghelper.cpp qandroidplatformfiledialoghelper.h
+ qandroidplatformfontdatabase.cpp qandroidplatformfontdatabase.h
+ qandroidplatformforeignwindow.cpp qandroidplatformforeignwindow.h
+ qandroidplatformintegration.cpp qandroidplatformintegration.h
+ qandroidplatformmenu.cpp qandroidplatformmenu.h
+ qandroidplatformmenubar.cpp qandroidplatformmenubar.h
+ qandroidplatformmenuitem.cpp qandroidplatformmenuitem.h
+ qandroidplatformoffscreensurface.cpp qandroidplatformoffscreensurface.h
+ qandroidplatformopenglcontext.cpp qandroidplatformopenglcontext.h
+ qandroidplatformopenglwindow.cpp qandroidplatformopenglwindow.h
+ qandroidplatformscreen.cpp qandroidplatformscreen.h
+ qandroidplatformservices.cpp qandroidplatformservices.h
+ qandroidplatformtheme.cpp qandroidplatformtheme.h
+ qandroidplatformwindow.cpp qandroidplatformwindow.h
+ qandroidsystemlocale.cpp qandroidsystemlocale.h
+ DEFINES
+ QT_STATICPLUGIN
+ INCLUDE_DIRECTORIES
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${QT_SOURCE_TREE}/src/3rdparty/android
+ LIBRARIES
+ Qt::AccessibilitySupportPrivate
+ Qt::CorePrivate
+ Qt::EglSupportPrivate
+ Qt::EventDispatcherSupportPrivate
+ Qt::FontDatabaseSupportPrivate
+ Qt::GuiPrivate
+ PUBLIC_LIBRARIES
+ Qt::AccessibilitySupport
+ Qt::Core
+ Qt::EglSupport
+ Qt::EventDispatcherSupport
+ Qt::FontDatabaseSupport
+ Qt::Gui
+ android
+ jnigraphics
+)
+
+#### Keys ignored in scope 1:.:.:android.pro:<TRUE>:
+# OTHER_FILES = "$$PWD/android.json"
+# _LOADED = "qt_plugin"
+# target.path = "$${target.path}/android"
+
+## Scopes:
+#####################################################################
+
+extend_target(qtforandroid CONDITION QT_FEATURE_vulkan
+ SOURCES
+ qandroidplatformvulkaninstance.cpp qandroidplatformvulkaninstance.h
+ qandroidplatformvulkanwindow.cpp qandroidplatformvulkanwindow.h
+ LIBRARIES
+ Qt::VulkanSupportPrivate
+ PUBLIC_LIBRARIES
+ Qt::VulkanSupport
+)
+
+extend_target(qtforandroid CONDITION QT_FEATURE_android_style_assets
+ SOURCES
+ extract.cpp
+)
+
+extend_target(qtforandroid CONDITION NOT QT_FEATURE_android_style_assets
+ SOURCES
+ extract-dummy.cpp
+)
diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt
index f0da443481..f8d23e8371 100644
--- a/src/plugins/platforms/android/CMakeLists.txt
+++ b/src/plugins/platforms/android/CMakeLists.txt
@@ -6,6 +6,7 @@
add_qt_plugin(qtforandroid
TYPE platforms
+ # OUTPUT_DIRECTORY "$$DESTDIR/android" # special case remove
DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES android # special case
SOURCES
androidcontentfileengine.cpp androidcontentfileengine.h
@@ -43,7 +44,7 @@ add_qt_plugin(qtforandroid
QT_STATICPLUGIN
INCLUDE_DIRECTORIES
${CMAKE_CURRENT_SOURCE_DIR}
- ${PROJECT_SOURCE_DIR}/src/3rdparty/android
+ ${QT_SOURCE_TREE}/src/3rdparty/android
LIBRARIES
Qt::AccessibilitySupportPrivate
Qt::CorePrivate
@@ -71,9 +72,7 @@ add_qt_plugin(qtforandroid
)
#### Keys ignored in scope 1:.:.:android.pro:<TRUE>:
-# DESTDIR = "$$DESTDIR/android"
# OTHER_FILES = "$$PWD/android.json"
-# PLUGIN_TYPE = "platforms"
# _LOADED = "qt_plugin"
# target.path = "$${target.path}/android"