diff options
| -rw-r--r-- | examples/bluetooth/bluetooth.pro | 2 | ||||
| -rw-r--r-- | examples/examples.pro | 4 | ||||
| -rw-r--r-- | examples/nfc/nfc.pro | 2 | ||||
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 2 | ||||
| -rw-r--r-- | src/imports/imports.pro | 4 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 4 | ||||
| -rw-r--r-- | tests/tests.pro | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/examples/bluetooth/bluetooth.pro b/examples/bluetooth/bluetooth.pro index 20bf6c6d..e3ef7691 100644 --- a/examples/bluetooth/bluetooth.pro +++ b/examples/bluetooth/bluetooth.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets) { +qtHaveModule(widgets) { SUBDIRS += btchat \ btscanner \ btfiletransfer \ diff --git a/examples/examples.pro b/examples/examples.pro index a6efc9a0..f5e92257 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -!isEmpty(QT.bluetooth.name):SUBDIRS += bluetooth -!isEmpty(QT.nfc.name):SUBDIRS += nfc +qtHaveModule(bluetooth): SUBDIRS += bluetooth +qtHaveModule(nfc): SUBDIRS += nfc diff --git a/examples/nfc/nfc.pro b/examples/nfc/nfc.pro index d219924c..ddf7456b 100644 --- a/examples/nfc/nfc.pro +++ b/examples/nfc/nfc.pro @@ -1,5 +1,5 @@ TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets) { +qtHaveModule(widgets) { SUBDIRS += \ annotatedurl \ ndefeditor \ diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index 55ac951b..58f73e02 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -59,7 +59,7 @@ SOURCES += \ qbluetoothtransferrequest.cpp \ qbluetoothtransferreply.cpp -config_bluez:contains(QT_CONFIG, dbus) { +config_bluez:qtHaveModule(dbus) { QT *= dbus DEFINES += QT_BLUEZ_BLUETOOTH diff --git a/src/imports/imports.pro b/src/imports/imports.pro index a6efc9a0..f5e92257 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -!isEmpty(QT.bluetooth.name):SUBDIRS += bluetooth -!isEmpty(QT.nfc.name):SUBDIRS += nfc +qtHaveModule(bluetooth): SUBDIRS += bluetooth +qtHaveModule(nfc): SUBDIRS += nfc diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index e3539b57..a88d77a2 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -3,7 +3,7 @@ TEMPLATE = subdirs SUBDIRS += \ cmake -!isEmpty(QT.bluetooth.name) { +qtHaveModule(bluetooth) { SUBDIRS += \ qbluetoothaddress \ qbluetoothdevicediscoveryagent \ @@ -20,7 +20,7 @@ SUBDIRS += \ qrfcommserver } -!isEmpty(QT.nfc.name) { +qtHaveModule(nfc) { SUBDIRS += \ qndefmessage \ qndefrecord \ diff --git a/tests/tests.pro b/tests/tests.pro index 6fa5383b..9bf70104 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,8 +1,8 @@ TEMPLATE = subdirs SUBDIRS += auto -linux*:!linux-armcc:contains(bluez_enabled, yes):contains(QT_CONFIG, dbus) { +linux*:!linux-armcc:contains(bluez_enabled, yes):qtHaveModule(dbus) { SUBDIRS += btclient } -!isEmpty(QT.nfc.name):SUBDIRS += nfctestserver +qtHaveModule(nfc): SUBDIRS += nfctestserver |