diff --git a/examples/nfc/corkboard/corkboard.pro b/examples/nfc/corkboard/corkboard.pro index 9d1de4b3025443a0e455319fe890b3c0b665a61c..858ac65d3b58d8a6dea4670e34491f85390bfa05 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 diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 6d3dacc3dcb45c043586cbf1976dcab787491f5e..6b23325f73feceeee4a96d64c03e494aa49da143 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -110,7 +110,7 @@ qtConfig(bluez) { qlowenergycontroller_p.cpp } -} else:android { +} else:android:!android-embedded { include(android/android.pri) DEFINES += QT_ANDROID_BLUETOOTH QT_FOR_PRIVATE += core-private androidextras diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index ce193efa9236ce34b5f28e6310d0c34860b35294..d3053115559a485408ece03b0b317e4761200f02 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -79,7 +79,7 @@ linux:!android:qtHaveModule(dbus) { include(neard/neard.pri) -} else:android { +} else:android:!android-embedded { NFC_BACKEND_AVAILABLE = yes DEFINES += QT_ANDROID_NFC ANDROID_PERMISSIONS = \ diff --git a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro b/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro index 0eae09dec43b7bc66fa050ee47ef4017b47eb2f8..6a0727846ab95aeae2df0ec5b5d793e12c98612f 100644 --- a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro +++ b/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro @@ -6,6 +6,6 @@ QT = core concurrent bluetooth testlib osx:QT += widgets -android { +android:!android-embedded { DEFINES += QT_ANDROID_BLUETOOTH } diff --git a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro index 32fc655852bbffd71bd476d059e3739c078245e0..83bc417ce62fde3066a9d531c6ce660415e1605c 100644 --- a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro +++ b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro @@ -11,6 +11,6 @@ OTHER_FILES += \ osx { DEFINES += QT_OSX_BLUETOOTH -} else: android { +} else:android:!android-embedded { DEFINES += QT_ANDROID_BLUETOOTH }