From d4886e1a50fd546f8e059ef9c539932d6d58c96d Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Mon, 24 Jun 2013 14:53:53 +0200 Subject: Enable Qt NFC in the CI system. Don't require CONFIG+=nfc to build QtNfc lib. This prevents proper test execution and there is no API commitment until the API is offcially released anyway. Excludes three auto tests from -developer-build builds as they require Q_AUTOTEST_EXPORT. Fixes compile errors associated to namespace'd builds of Qt. Revert "Remove not needed symbol 'qHash(const QNdefRecord&)'" The symbol is needed during compilation by Windows. This reverts commit 39901af48f40f0672731a1f62dc003c4b37d1fec. Change-Id: I61c644bbfc4906729e6d2b9deb741989030c8624 Reviewed-by: Sergio Ahumada --- src/src.pro | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/src.pro') diff --git a/src/src.pro b/src/src.pro index 1f96b1f1..9f865e0a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,11 +1,4 @@ TEMPLATE = subdirs CONFIG += ordered -# The Qt NFC module is currently not supported. The API is not finalized and may change. -# The Qt NFC module can be built by passing CONFIG+=nfc to qmake. -nfc { - message("Building unsupported Qt NFC module, API is not finalized and may change.") - SUBDIRS += nfc -} - -SUBDIRS += bluetooth imports +SUBDIRS += bluetooth nfc imports -- cgit v1.2.3