summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorOtto Ryynänen <otto.ryynanen@qt.io>2017-04-21 15:49:30 +0300
committerOtto Ryynänen <otto.ryynanen@qt.io>2017-04-24 12:28:09 +0000
commitca9ad4f3f6af2394b23dae288c1ef2b2faaa8141 (patch)
tree5849bd3090c5ef47f6672b330affde96723ada92 /examples
parent5391a325eadcee86a494aa96a3f8edae1be55556 (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. Those flags are set in mkspecs when building for embedded Android. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: I2ded43d7ed46a99ba70301f07a791ed4a148c6c0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/nfc/corkboard/corkboard.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/examples/nfc/corkboard/corkboard.pro b/examples/nfc/corkboard/corkboard.pro
index 9d1de4b3..858ac65d 100644
--- a/examples/nfc/corkboard/corkboard.pro
+++ b/examples/nfc/corkboard/corkboard.pro
@@ -13,7 +13,9 @@ OTHER_FILES += \
corkboards.qml \
Mode.qml
+!android-embedded {
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+}
target.path = $$[QT_INSTALL_EXAMPLES]/nfc/corkboard
INSTALLS += target