diff options
| author | Otto Ryynänen <otto.ryynanen@qt.io> | 2017-04-20 09:42:23 +0300 |
|---|---|---|
| committer | Otto Ryynänen <otto.ryynanen@qt.io> | 2017-04-24 11:50:27 +0000 |
| commit | b67458583c3cd38b48d8d00a88c9e236ca64b368 (patch) | |
| tree | c034424328279fd39d9d343a8bbcda076d38fe6a /examples | |
| parent | 3a87d4891067f06bfcc7e9b30860e679ec6363d7 (diff) | |
Support for Q_OS_ANDROID_EMBEDDED and android-embedded builds
A Native 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.
Those flags are set in mkspecs when building for embedded Android.
This commit enables the possibility to build native Android builds
(i.e. Qt build for Android baselayer only, without JNI)
Change-Id: I3f88568f34502c6cfafadbbebd4dd2212a3cd0c4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/virtualkeyboard/basic/basic.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/virtualkeyboard/basic/basic.pro b/examples/virtualkeyboard/basic/basic.pro index 2e0c6f68..b91df554 100644 --- a/examples/virtualkeyboard/basic/basic.pro +++ b/examples/virtualkeyboard/basic/basic.pro @@ -29,7 +29,7 @@ disable-xcb { CONFIG += disable-desktop } -disable-desktop|!isEmpty(CROSS_COMPILE)|qnx { +disable-desktop|android-embedded|!isEmpty(CROSS_COMPILE)|qnx { DEFINES += MAIN_QML=\\\"basic-b2qt.qml\\\" } else { DEFINES += MAIN_QML=\\\"Basic.qml\\\" |