1 files changed, 11 insertions, 28 deletions
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro
index 16737e73..d3053115 100644
--- a/src/nfc/nfc.pro
+++ b/src/nfc/nfc.pro
@@ -1,8 +1,6 @@
 TARGET = QtNfc
 QT = core
 
-load(qt_module)
-
 QMAKE_DOCS = $$PWD/doc/qtnfc.qdocconf
 OTHER_FILES += doc/src/*.qdoc   # show .qdoc files in Qt Creator
 
@@ -59,7 +57,7 @@ SOURCES += \
 linux:!android:qtHaveModule(dbus) {
     NFC_BACKEND_AVAILABLE = yes
 
-    QT += dbus
+    QT_PRIVATE += dbus
 
     DEFINES += NEARD_NFC
 
@@ -76,33 +74,14 @@ linux:!android:qtHaveModule(dbus) {
         qllcpserver_p.cpp \
         qnearfieldsharemanagerimpl_p.cpp \
         qnearfieldsharetargetimpl_p.cpp \
-        qnearfieldmanager_neard.cpp
+        qnearfieldmanager_neard.cpp \
+        qnearfieldtarget_neard_p.cpp
 
     include(neard/neard.pri)
 
-} else:simulator {
-    NFC_BACKEND_AVAILABLE = yes
-
-    QT *= gui
-
-    PRIVATE_HEADERS += \
-        qnearfieldmanagervirtualbase_p.h \
-        qnearfieldmanager_simulator_p.h \
-        qllcpsocket_simulator_p.h \
-        qllcpserver_simulator_p.h \
-        qnearfieldsharemanagerimpl_p.h \
-        qnearfieldsharetargetimpl_p.h
-
-
-    SOURCES += \
-        qnearfieldmanagervirtualbase.cpp \
-        qnearfieldmanager_simulator.cpp \
-        qllcpsocket_simulator_p.cpp \
-        qllcpserver_simulator_p.cpp \
-        qnearfieldsharemanagerimpl_p.cpp \
-        qnearfieldsharetargetimpl_p.cpp
-} else:android:!android-no-sdk {
+} else:android:!android-embedded {
     NFC_BACKEND_AVAILABLE = yes
+    DEFINES += QT_ANDROID_NFC
     ANDROID_PERMISSIONS = \
         android.permission.NFC
     ANDROID_BUNDLED_JAR_DEPENDENCIES = \
@@ -110,7 +89,7 @@ linux:!android:qtHaveModule(dbus) {
     ANDROID_JAR_DEPENDENCIES = \
         jar/QtNfc.jar:org.qtproject.qt5.android.nfc.QtNfc
     DEFINES += ANDROID_NFC
-    QT += core-private gui androidextras
+    QT_PRIVATE += core-private gui androidextras
 
     PRIVATE_HEADERS += \
         qllcpserver_android_p.h \
@@ -129,6 +108,7 @@ linux:!android:qtHaveModule(dbus) {
         android/androidjninfc.cpp \
         qnearfieldmanager_android.cpp \
         qnearfieldtarget_android.cpp \
+        qnearfieldtarget_android_p.cpp \
         qnearfieldsharemanagerimpl_p.cpp \
         qnearfieldsharetargetimpl_p.cpp \
         android/androidmainnewintentlistener.cpp
@@ -149,7 +129,10 @@ isEmpty(NFC_BACKEND_AVAILABLE) {
         qllcpserver_p.cpp \
         qnearfieldmanagerimpl_p.cpp \
         qnearfieldsharemanagerimpl_p.cpp \
-        qnearfieldsharetargetimpl_p.cpp
+        qnearfieldsharetargetimpl_p.cpp \
+        qnearfieldtarget_p.cpp
 }
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+
+load(qt_module)