aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtto Ryynänen <otto.ryynanen@qt.io>2017-04-21 12:29:58 +0300
committerOtto Ryynänen <otto.ryynanen@qt.io>2017-04-24 11:50:59 +0000
commit015add9d0887601845787d60ce1d6af635861b23 (patch)
treea5b902ca5e7372be40a4ce0dff024b35a90fcbfd
parent36846eca9ae810d213b2fe2ae5d9ff11137d4597 (diff)
Support for Q_OS_ANDROID_EMBEDDED and android-embedded builds
The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: I27602edbe6895215a640a25bc1427732d9a8d550 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
-rw-r--r--src/plugins/gamepads/gamepads.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gamepads/gamepads.pro b/src/plugins/gamepads/gamepads.pro
index dd60750..97b47fb 100644
--- a/src/plugins/gamepads/gamepads.pro
+++ b/src/plugins/gamepads/gamepads.pro
@@ -4,4 +4,4 @@ qtConfig(sdl2): SUBDIRS += sdl2
!android: qtConfig(evdev): SUBDIRS += evdev
win32: !wince*: SUBDIRS += xinput
darwin: !watchos: SUBDIRS += darwin
-android: SUBDIRS += android
+android: !android-embedded: SUBDIRS += android