diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 34 | ||||
| -rw-r--r-- | tests/tests.pro | 5 |
2 files changed, 21 insertions, 18 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 1f1b12cb..f3f773df 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -12,11 +12,11 @@ SUBDIRS += \ qbluetoothtransferrequest \ qbluetoothuuid \ ql2capserver \ - qndefmessage \ - qndefrecord \ - qnearfieldmanager \ - qnearfieldtagtype1 \ - qnearfieldtagtype2 \ +# qndefmessage \ +# qndefrecord \ +# qnearfieldmanager \ +# qnearfieldtagtype1 \ +# qnearfieldtagtype2 \ qrfcommserver \ !contains(QT_CONFIG, bluetooth): SUBDIRS -= \ @@ -32,16 +32,16 @@ SUBDIRS += \ qbluetoothuuid \ ql2capserver \ -!contains(QT_CONFIG, nfc): SUBDIRS -= \ - qndefmessage \ - qndefrecord \ - qnearfieldmanager \ - qnearfieldtagtype1 \ - qnearfieldtagtype2 \ - -# QTBUG-22015 these do not compile. -SUBDIRS -= \ - qnearfieldmanager \ - qnearfieldtagtype1 \ - qnearfieldtagtype2 \ +#!contains(QT_CONFIG, nfc): SUBDIRS -= \ +# qndefmessage \ +# qndefrecord \ +# qnearfieldmanager \ +# qnearfieldtagtype1 \ +# qnearfieldtagtype2 \ +# +## QTBUG-22015 these do not compile. +#SUBDIRS -= \ +# qnearfieldmanager \ +# qnearfieldtagtype1 \ +# qnearfieldtagtype2 \ diff --git a/tests/tests.pro b/tests/tests.pro index 3b5abbad..f00a536e 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,5 +1,8 @@ TEMPLATE = subdirs -SUBDIRS += auto nfctestserver +SUBDIRS += auto + +# NFC disabled +#SUBDIRS += nfctestserver linux*:!linux-armcc:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) { SUBDIRS += btclient |