4 files changed, 7 insertions, 16 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index a88d77a2..9d817c7e 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -26,7 +26,7 @@ qtHaveModule(nfc) {
         qndefrecord \
         qnearfieldmanager \
         qnearfieldtagtype1 \
-        qnearfieldtagtype2 \
+        qnearfieldtagtype2
 }
 
 qbluetoothservicediscoveryagent.CONFIG += no_check_target # QTBUG-22017
diff --git a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro
index 532409ab..558f00fd 100644
--- a/tests/auto/qnearfieldmanager/qnearfieldmanager.pro
+++ b/tests/auto/qnearfieldmanager/qnearfieldmanager.pro
@@ -1,3 +1,5 @@
+requires(contains(QT_CONFIG, private_tests))
+
 SOURCES += tst_qnearfieldmanager.cpp
 TARGET = tst_qnearfieldmanager
 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 \
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 \
diff --git a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
index 36e80260..931df5d6 100644
--- a/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
+++ b/tests/auto/qnearfieldtagtype2/qnearfieldtagtype2.pro
@@ -1,3 +1,5 @@
+requires(contains(QT_CONFIG, private_tests))
+
 SOURCES += tst_qnearfieldtagtype2.cpp
 TARGET = tst_qnearfieldtagtype2
 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 \
     qnearfieldtarget_emulator_p.h \