diff options
| author | Eirik Aavitsland <eirik.aavitsland@theqtcompany.com> | 2016-03-18 13:59:44 +0100 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2016-04-29 11:04:51 +0000 |
| commit | d4211eda4eeb1de6daaa139932e7796d611babac (patch) | |
| tree | 431f4a180c69f24f289429870151491c27984987 | |
| parent | f8759f683cfc433c432059e1160d2ab657baaec6 (diff) | |
Remove the traces of the discontinued android-no-sdk platform
Change-Id: I0358b76dd2b9fb2a6224c4b9b2082a748b2d5d7a
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
| -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, 5 insertions, 5 deletions
diff --git a/examples/nfc/corkboard/corkboard.pro b/examples/nfc/corkboard/corkboard.pro index 8c9b05b2..93142568 100644 --- a/examples/nfc/corkboard/corkboard.pro +++ b/examples/nfc/corkboard/corkboard.pro @@ -13,7 +13,7 @@ OTHER_FILES += \ corkboards.qml \ Mode.qml -android:!android-no-sdk { +android { OTHER_FILES += \ android/AndroidManifest.xml diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index c771f237..a5d6aebe 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -113,7 +113,7 @@ config_bluez:qtHaveModule(dbus) { qlowenergycontroller_p.cpp } -} else:android:!android-no-sdk { +} else:android { 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 9d28eb81..8e737dd5 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -78,7 +78,7 @@ linux:!android:qtHaveModule(dbus) { include(neard/neard.pri) -} else:android:!android-no-sdk { +} else:android { NFC_BACKEND_AVAILABLE = yes ANDROID_PERMISSIONS = \ android.permission.NFC diff --git a/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro b/tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro index 14c410e3..0eae09de 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-no-sdk { +android { DEFINES += QT_ANDROID_BLUETOOTH } diff --git a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro index 01a836fd..641ff6c7 100644 --- a/tests/auto/qbluetoothsocket/qbluetoothsocket.pro +++ b/tests/auto/qbluetoothsocket/qbluetoothsocket.pro @@ -11,7 +11,7 @@ OTHER_FILES += \ osx { DEFINES += QT_OSX_BLUETOOTH -} else:android:!android-no-sdk { +} else:android { DEFINES += QT_ANDROID_BLUETOOTH } config_bluez:qtHaveModule(dbus) { DEFINES += QT_BLUEZ_BLUETOOTH |