diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-05-19 08:56:46 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-05-19 08:56:46 +0200 |
| commit | d5063285a8e6c01c4e4fc16fe76ed162b8e21e1d (patch) | |
| tree | 5ec34c61cb09554c4bf45173360fe93321331b85 /tests | |
| parent | 79bebc91995821586bdde245c9b13a50d63090c9 (diff) | |
| parent | 4593b79d84b9c8cc818d3c30e3882d699228339f (diff) | |
Merge remote-tracking branch 'gerrit/5.9' into dev
Change-Id: I37e63916ff053ebc532ae1a0e3cb518eb5369866
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qbluetoothserviceinfo/qbluetoothserviceinfo.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qbluetoothsocket/qbluetoothsocket.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qndefnfcsmartposterrecord/BLACKLIST | 3 |
3 files changed, 5 insertions, 2 deletions
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 } diff --git a/tests/auto/qndefnfcsmartposterrecord/BLACKLIST b/tests/auto/qndefnfcsmartposterrecord/BLACKLIST new file mode 100644 index 00000000..05536220 --- /dev/null +++ b/tests/auto/qndefnfcsmartposterrecord/BLACKLIST @@ -0,0 +1,3 @@ +[tst_action] +# QTBUG-20268 +b2qt |