diff options
| -rw-r--r-- | examples/nfc/corkboard/corkboard.pro | 2 | ||||
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 2 | ||||
| -rw-r--r-- | src/nfc/nfc.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qbluetoothsocket/qbluetoothsocket.pro | 2 |
5 files changed, 6 insertions, 4 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 diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 6d3dacc3..6b23325f 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 ce193efa..d3053115 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 0eae09de..6a072784 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 32fc6558..83bc417c 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 } |