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 --- tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'tests/auto/qnearfieldtagtype1') diff --git a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro index 9f4ea6d5..818392a7 100644 --- a/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro +++ b/tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro @@ -1,3 +1,5 @@ +requires(contains(QT_CONFIG, private_tests)) + SOURCES += tst_qnearfieldtagtype1.cpp TARGET = tst_qnearfieldtagtype1 CONFIG += testcase @@ -7,11 +9,6 @@ QT = core nfc-private testlib INCLUDEPATH += ../../../src/nfc VPATH += ../../../src/nfc -# This test includes source code from QtNfc library. Define the namespace which moc generated code -# should be in. -DEFINES += QT_BEGIN_MOC_NAMESPACE=\""namespace QtNfc {"\" -DEFINES += QT_END_MOC_NAMESPACE=\""}"\" - HEADERS += \ qnearfieldmanagervirtualbase_p.h \ qnearfieldmanager_emulator_p.h \ -- cgit v1.2.3