diff options
| author | Aaron McCarthy <mccarthy.aaron@gmail.com> | 2012-10-01 13:28:16 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-01 12:04:55 +0200 |
| commit | f3d8f66116af4319650d8f3e7ca069275fdfa780 (patch) | |
| tree | 2b7dc73c029adfdf0302409a2422b3df4d9e5c54 /tests/auto/auto.pro | |
| parent | 3f4a920f87842e1bbb20f72ce04d6da7a866ab1d (diff) | |
Further porting of NFC module from mobility to Qt 5.
Includes the following changes:
* Conditionally enables building of the NFC module when qmake is
run with CONFIG+=nfc.
* Correctly build within the QtNfc namespace.
* Fix compile errors in examples, enable building of NFC examples.
* Fix compile errors in tests, enable building of NFC tests.
Mark the some NFC tests as insignificant as they currently crash.
Notably does not enable NFC documentation generation.
Task-number: QTBUG-22015
Change-Id: I9ff170c45848c8f0215e9427797922f840c2f015
Reviewed-by: Alex <ablasche@gmail.com>
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 67 |
1 files changed, 24 insertions, 43 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index dec893bb..e3539b57 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,51 +1,32 @@ TEMPLATE = subdirs SUBDIRS += \ - qbluetoothaddress \ - qbluetoothdevicediscoveryagent \ - qbluetoothdeviceinfo \ - qbluetoothlocaldevice \ - qbluetoothhostinfo \ - qbluetoothservicediscoveryagent \ - qbluetoothserviceinfo \ - qbluetoothsocket \ - qbluetoothtransfermanager \ - qbluetoothtransferrequest \ - qbluetoothuuid \ - ql2capserver \ -# qndefmessage \ -# qndefrecord \ -# qnearfieldmanager \ -# qnearfieldtagtype1 \ -# qnearfieldtagtype2 \ - qrfcommserver \ cmake -!contains(QT_CONFIG, bluetooth): SUBDIRS -= \ - qbluetoothaddress \ - qbluetoothdevicediscoveryagent \ - qbluetoothdeviceinfo \ - qbluetoothlocaldevice \ - qbluetoothhostinfo \ - qbluetoothservicediscoveryagent \ - qbluetoothserviceinfo \ - qbluetoothsocket \ - qbluetoothtransfermanager \ - qbluetoothtransferrequest \ - qbluetoothuuid \ - ql2capserver \ +!isEmpty(QT.bluetooth.name) { + SUBDIRS += \ + qbluetoothaddress \ + qbluetoothdevicediscoveryagent \ + qbluetoothdeviceinfo \ + qbluetoothlocaldevice \ + qbluetoothhostinfo \ + qbluetoothservicediscoveryagent \ + qbluetoothserviceinfo \ + qbluetoothsocket \ + qbluetoothtransfermanager \ + qbluetoothtransferrequest \ + qbluetoothuuid \ + ql2capserver \ + qrfcommserver +} -#!contains(QT_CONFIG, nfc): SUBDIRS -= \ -# qndefmessage \ -# qndefrecord \ -# qnearfieldmanager \ -# qnearfieldtagtype1 \ -# qnearfieldtagtype2 \ -# -## QTBUG-22015 these do not compile. -#SUBDIRS -= \ -# qnearfieldmanager \ -# qnearfieldtagtype1 \ -# qnearfieldtagtype2 \ +!isEmpty(QT.nfc.name) { + SUBDIRS += \ + qndefmessage \ + qndefrecord \ + qnearfieldmanager \ + qnearfieldtagtype1 \ + qnearfieldtagtype2 \ +} qbluetoothservicediscoveryagent.CONFIG += no_check_target # QTBUG-22017 |