diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-05 16:54:52 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-05 15:00:42 +0000 |
commit | 143981b570df906b036165c243da155daee3b599 (patch) | |
tree | 82d3788c8efbe18b7d21022727c04391cad6f776 | |
parent | 64f17cca0449c4bcd2ba3590e0e9c481be46ac4c (diff) |
Add the Android QPA plugin to the CMake build
Had to apply on unused-variable -Werror fix on top.
Change-Id: I4e8decf1e0a1bd56d4168bc2c7153ef3f5e31e13
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r-- | src/plugins/platforms/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plugins/platforms/android/CMakeLists.txt | 92 | ||||
-rw-r--r-- | src/plugins/platforms/android/qandroidplatformwindow.h | 4 |
3 files changed, 95 insertions, 3 deletions
diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt index 5d187ffc33..fc743c955f 100644 --- a/src/plugins/platforms/CMakeLists.txt +++ b/src/plugins/platforms/CMakeLists.txt @@ -1,5 +1,5 @@ if(ANDROID) # AND NOT android-embedded -# TODO add_subdirectory(android) + add_subdirectory(android) endif() if(NOT ANDROID) diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt new file mode 100644 index 0000000000..b60712a718 --- /dev/null +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -0,0 +1,92 @@ +# Generated from android.pro. + +##################################################################### +## qtforandroid Plugin: +##################################################################### + +add_qt_plugin(qtforandroid + TYPE platforms + 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} + ${PROJECT_SOURCE_DIR}/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>: +# DESTDIR = "$$DESTDIR/android" +# OTHER_FILES = "$$PWD/android.json" +# PLUGIN_TYPE = "platforms" +# _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/qandroidplatformwindow.h b/src/plugins/platforms/android/qandroidplatformwindow.h index 5edd274759..d8eb6b7b7f 100644 --- a/src/plugins/platforms/android/qandroidplatformwindow.h +++ b/src/plugins/platforms/android/qandroidplatformwindow.h @@ -65,8 +65,8 @@ public: void setParent(const QPlatformWindow *window) override; WId winId() const override { return m_windowId; } - bool setMouseGrabEnabled(bool grab) override { return false; } - bool setKeyboardGrabEnabled(bool grab) override { return false; } + bool setMouseGrabEnabled(bool grab) override { Q_UNUSED(grab); return false; } + bool setKeyboardGrabEnabled(bool grab) override { Q_UNUSED(grab); return false; } QAndroidPlatformScreen *platformScreen() const; |