Merge remote-tracking branch 'origin/5.3' into 5.4

Conflicts:
	src/bluetooth/qbluetoothdevicediscoveryagent_p.cpp

Change-Id: Ie8bf1903f9c7c1ccd5b05a3f97049ae0882b88b8

9 files changed, 99 insertions, 0 deletions

diff --git a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h
index 3e3b7dc7..279fb063 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h
+++ b/src/imports/bluetooth/qdeclarativebluetoothdiscoverymodel_p.h
@@ -34,6 +34,17 @@
 #ifndef QDECLARATIVECONTACTMODEL_P_H
 #define QDECLARATIVECONTACTMODEL_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 <QAbstractListModel>
 #include <QQmlParserStatus>
 #include <QQmlListProperty>
diff --git a/src/imports/bluetooth/qdeclarativebluetoothservice_p.h b/src/imports/bluetooth/qdeclarativebluetoothservice_p.h
index e349f62c..0e04b790 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothservice_p.h
+++ b/src/imports/bluetooth/qdeclarativebluetoothservice_p.h
@@ -34,6 +34,17 @@
 #ifndef QDECLARATIVEBLUETOOTHSERVICE_P_H
 #define QDECLARATIVEBLUETOOTHSERVICE_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 <QObject>
 #include <qqml.h>
 #include <qbluetoothserviceinfo.h>
diff --git a/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h b/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h
index 1d34c596..35a8c504 100644
--- a/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h
+++ b/src/imports/bluetooth/qdeclarativebluetoothsocket_p.h
@@ -34,6 +34,17 @@
 #ifndef QDECLARATIVEBLUETOOTHSOCKET_P_H
 #define QDECLARATIVEBLUETOOTHSOCKET_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 <QObject>
 #include <qqml.h>
 #include <QQmlParserStatus>
diff --git a/src/imports/nfc/qdeclarativendeffilter_p.h b/src/imports/nfc/qdeclarativendeffilter_p.h
index 60227d0d..e5b2fced 100644
--- a/src/imports/nfc/qdeclarativendeffilter_p.h
+++ b/src/imports/nfc/qdeclarativendeffilter_p.h
@@ -34,6 +34,17 @@
 #ifndef QDECLARATIVENDEFFILTER_P_H
 #define QDECLARATIVENDEFFILTER_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/QObject>
 #include <qqmlndefrecord.h>
 
diff --git a/src/imports/nfc/qdeclarativendefmimerecord_p.h b/src/imports/nfc/qdeclarativendefmimerecord_p.h
index bfcbc8a5..8438a1f6 100644
--- a/src/imports/nfc/qdeclarativendefmimerecord_p.h
+++ b/src/imports/nfc/qdeclarativendefmimerecord_p.h
@@ -34,6 +34,17 @@
 #ifndef QDECLARATIVENDEFMIMERECORD_P_H
 #define QDECLARATIVENDEFMIMERECORD_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 <qqmlndefrecord.h>
 
 QT_USE_NAMESPACE
diff --git a/src/imports/nfc/qdeclarativendeftextrecord_p.h b/src/imports/nfc/qdeclarativendeftextrecord_p.h
index ef097792..ca11c017 100644
--- a/src/imports/nfc/qdeclarativendeftextrecord_p.h
+++ b/src/imports/nfc/qdeclarativendeftextrecord_p.h
@@ -34,6 +34,17 @@
 #ifndef QDECLARATIVENDEFTEXTRECORD_P_H
 #define QDECLARATIVENDEFTEXTRECORD_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 <qqmlndefrecord.h>
 
 #include <qndefnfctextrecord.h>
diff --git a/src/imports/nfc/qdeclarativendefurirecord_p.h b/src/imports/nfc/qdeclarativendefurirecord_p.h
index 62c31872..02abe36e 100644
--- a/src/imports/nfc/qdeclarativendefurirecord_p.h
+++ b/src/imports/nfc/qdeclarativendefurirecord_p.h
@@ -34,6 +34,17 @@
 #ifndef QDECLARATIVENDEFURIRECORD_P_H
 #define QDECLARATIVENDEFURIRECORD_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 <qqmlndefrecord.h>
 
 #include <qndefnfcurirecord.h>
diff --git a/src/imports/nfc/qdeclarativenearfield_p.h b/src/imports/nfc/qdeclarativenearfield_p.h
index d17d14c9..2e151e36 100644
--- a/src/imports/nfc/qdeclarativenearfield_p.h
+++ b/src/imports/nfc/qdeclarativenearfield_p.h
@@ -34,6 +34,17 @@
 #ifndef QDECLARATIVENEARFIELD_P_H
 #define QDECLARATIVENEARFIELD_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/QObject>
 #include <QtQml/qqml.h>
 #include <QtQml/QQmlParserStatus>
diff --git a/src/imports/nfc/qdeclarativenearfieldsocket_p.h b/src/imports/nfc/qdeclarativenearfieldsocket_p.h
index 07506848..e6664d8e 100644
--- a/src/imports/nfc/qdeclarativenearfieldsocket_p.h
+++ b/src/imports/nfc/qdeclarativenearfieldsocket_p.h
@@ -34,6 +34,17 @@
 #ifndef QDECLARATIVENEARFIELDSOCKET_P_H
 #define QDECLARATIVENEARFIELDSOCKET_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/QObject>
 #include <QtQml/qqml.h>
 #include <QtQml/QQmlParserStatus>