diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-06-24 14:53:53 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-26 12:12:35 +0200 |
| commit | d4886e1a50fd546f8e059ef9c539932d6d58c96d (patch) | |
| tree | 341a8cba6b0bd5cedd8f30a0e52742e6a8742eda /tests/auto/qnearfieldtagtype1 | |
| parent | f2d6f3b6a6c5eebc36e0206c85896c1142f31229 (diff) | |
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 <sergio.ahumada@digia.com>
Diffstat (limited to 'tests/auto/qnearfieldtagtype1')
| -rw-r--r-- | tests/auto/qnearfieldtagtype1/qnearfieldtagtype1.pro | 7 |
1 files changed, 2 insertions, 5 deletions
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 \ |