Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: Ieb4c4a3ce134e53b1387ccedae029d5a9ade92f8

9 files changed, 99 insertions, 0 deletions

diff --git a/src/nfc/android/androidjninfc_p.h b/src/nfc/android/androidjninfc_p.h
index fd69412a..bbfc0f5a 100644
--- a/src/nfc/android/androidjninfc_p.h
+++ b/src/nfc/android/androidjninfc_p.h
@@ -33,6 +33,17 @@
 #ifndef ANDROIDJNINFC_H
 #define ANDROIDJNINFC_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qglobal.h"
 
 #include <QtAndroidExtras/QAndroidJniObject>
diff --git a/src/nfc/android/androidmainnewintentlistener_p.h b/src/nfc/android/androidmainnewintentlistener_p.h
index 6a016339..81cdcc8f 100644
--- a/src/nfc/android/androidmainnewintentlistener_p.h
+++ b/src/nfc/android/androidmainnewintentlistener_p.h
@@ -34,6 +34,17 @@
 #ifndef ANDROIDMAINNEWINTENTLISTENER_P_H_
 #define ANDROIDMAINNEWINTENTLISTENER_P_H_
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QtCore/private/qjnihelpers_p.h>
 
 #include "qlist.h"
diff --git a/src/nfc/neard/neard_helper_p.h b/src/nfc/neard/neard_helper_p.h
index 274c5142..1267a26b 100644
--- a/src/nfc/neard/neard_helper_p.h
+++ b/src/nfc/neard/neard_helper_p.h
@@ -35,6 +35,17 @@
 #ifndef NEARD_HELPER_P_H
 #define NEARD_HELPER_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QMetaType>
 #include <QDBusObjectPath>
 
diff --git a/src/nfc/qllcpserver_android_p.h b/src/nfc/qllcpserver_android_p.h
index be725719..53b33a22 100644
--- a/src/nfc/qllcpserver_android_p.h
+++ b/src/nfc/qllcpserver_android_p.h
@@ -34,6 +34,17 @@
 #ifndef QLLCPSERVER_ANDROID_P_H
 #define QLLCPSERVER_ANDROID_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qllcpserver_p.h"
 //#include "nfc/nfc.h"
 
diff --git a/src/nfc/qllcpsocket_android_p.h b/src/nfc/qllcpsocket_android_p.h
index 02865823..81c65c9a 100644
--- a/src/nfc/qllcpsocket_android_p.h
+++ b/src/nfc/qllcpsocket_android_p.h
@@ -34,6 +34,17 @@
 #ifndef QLLCPSOCKET_ANDROID_P_H
 #define QLLCPSOCKET_ANDROID_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qllcpsocket_p.h"
 
 //#include "qnearfieldtarget_ANDROID_p.h"
diff --git a/src/nfc/qnearfieldmanager_android_p.h b/src/nfc/qnearfieldmanager_android_p.h
index 3d45b700..79b16e7b 100644
--- a/src/nfc/qnearfieldmanager_android_p.h
+++ b/src/nfc/qnearfieldmanager_android_p.h
@@ -34,6 +34,17 @@
 #ifndef QNEARFIELDMANAGER_ANDROID_P_H
 #define QNEARFIELDMANAGER_ANDROID_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qnearfieldmanager_p.h"
 #include "qnearfieldmanager.h"
 #include "qnearfieldtarget.h"
diff --git a/src/nfc/qnearfieldmanager_neard_p.h b/src/nfc/qnearfieldmanager_neard_p.h
index 856851d4..fedebb88 100644
--- a/src/nfc/qnearfieldmanager_neard_p.h
+++ b/src/nfc/qnearfieldmanager_neard_p.h
@@ -35,6 +35,17 @@
 #ifndef QNEARFIELDMANAGER_NEARD_H
 #define QNEARFIELDMANAGER_NEARD_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qnearfieldmanager_p.h"
 #include "qnearfieldmanager.h"
 #include "qnearfieldtarget.h"
diff --git a/src/nfc/qnearfieldtarget_android_p.h b/src/nfc/qnearfieldtarget_android_p.h
index ef9b5fdc..73f2499c 100644
--- a/src/nfc/qnearfieldtarget_android_p.h
+++ b/src/nfc/qnearfieldtarget_android_p.h
@@ -34,6 +34,17 @@
 #ifndef QNEARFIELDTARGET_ANDROID_P_H
 #define QNEARFIELDTARGET_ANDROID_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "android/androidjninfc_p.h"
 #include "qnearfieldtarget.h"
 #include "qnearfieldtarget_p.h"
diff --git a/src/nfc/qnearfieldtarget_neard_p.h b/src/nfc/qnearfieldtarget_neard_p.h
index ff7c3f1d..d1631607 100644
--- a/src/nfc/qnearfieldtarget_neard_p.h
+++ b/src/nfc/qnearfieldtarget_neard_p.h
@@ -35,6 +35,17 @@
 #ifndef QNEARFIELDTARGET_NEARD_P_H
 #define QNEARFIELDTARGET_NEARD_P_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include <QDBusObjectPath>
 #include <QDBusVariant>