From f3d8f66116af4319650d8f3e7ca069275fdfa780 Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Mon, 1 Oct 2012 13:28:16 +1000 Subject: 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 --- examples/examples.pro | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'examples/examples.pro') diff --git a/examples/examples.pro b/examples/examples.pro index 36b1ecb5..a6efc9a0 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,11 +1,4 @@ TEMPLATE = subdirs -!contains(QT_CONFIG, no-widgets) { - SUBDIRS += bluetooth -} -SUBDIRS += bluetooth - -#Qt NFC based examples -#SUBDIRS += poster \ -# ndefeditor \ -# annotatedurl +!isEmpty(QT.bluetooth.name):SUBDIRS += bluetooth +!isEmpty(QT.nfc.name):SUBDIRS += nfc -- cgit v1.2.3