diff options
| author | Otto Ryynänen <otto.ryynanen@qt.io> | 2017-06-02 12:53:23 +0300 |
|---|---|---|
| committer | Otto Ryynänen <otto.ryynanen@qt.io> | 2018-01-20 18:16:59 +0000 |
| commit | 6d50f746fe05a7008b63818e77784dd0c99270a1 (patch) | |
| tree | 81205c6fd7b4832f244549296c643c05fff1b437 /mkspecs | |
| parent | e211ab76d766878b4dbe88901b9a7a4a70ce7332 (diff) | |
| download | qtbase-6d50f746fe05a7008b63818e77784dd0c99270a1.tar.gz | |
Support for Q_OS_ANDROID_EMBEDDED and android-embedded build flags
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: I8406e959fdf1c8d9efebbbe53f1a391fa25f336a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/android/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 913ab71412..e6b2431f9a 100644 --- a/mkspecs/features/android/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf @@ -1,4 +1,4 @@ -contains(TEMPLATE, ".*app"):!build_pass: { +contains(TEMPLATE, ".*app"):!build_pass:!android-embedded { defineReplace(emitString) { return("\"$$replace(1, \\\\, \\\\)\"") |