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

Change-Id: Ieb4c4a3ce134e53b1387ccedae029d5a9ade92f8

37 files changed, 391 insertions, 11 deletions

diff --git a/src/bluetooth/android/lowenergynotificationhub_p.h b/src/bluetooth/android/lowenergynotificationhub_p.h
index 0395f9db..55da689f 100644
--- a/src/bluetooth/android/lowenergynotificationhub_p.h
+++ b/src/bluetooth/android/lowenergynotificationhub_p.h
@@ -34,6 +34,17 @@
 #ifndef LOWENERGYNOTIFICATIONHUB_H
 #define LOWENERGYNOTIFICATIONHUB_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 <QtCore/QReadWriteLock>
 #include <QtCore/private/qjnihelpers_p.h>
diff --git a/src/bluetooth/bluez/bluez5_helper_p.h b/src/bluetooth/bluez/bluez5_helper_p.h
index e1fb90c5..a3f164b0 100644
--- a/src/bluetooth/bluez/bluez5_helper_p.h
+++ b/src/bluetooth/bluez/bluez5_helper_p.h
@@ -34,6 +34,17 @@
 #ifndef BLUEZ5_HELPER_H
 #define BLUEZ5_HELPER_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 <QtDBus/QtDBus>
 #include <QtBluetooth/QBluetoothAddress>
diff --git a/src/bluetooth/doc/src/bluetooth-le-overview.qdoc b/src/bluetooth/doc/src/bluetooth-le-overview.qdoc
index 909beae2..70d9908a 100644
--- a/src/bluetooth/doc/src/bluetooth-le-overview.qdoc
+++ b/src/bluetooth/doc/src/bluetooth-le-overview.qdoc
@@ -35,7 +35,7 @@ Low Energy devices.
 \tableofcontents
 
     The Qt Bluetooth Low Energy API was introduced by Qt 5.4. Since Qt 5.5 the API
-    is frozen and a compatibility guarantee is given for future releases.
+    is final and a compatibility guarantee is given for future releases.
     At the moment, Qt supports the Bluetooth Low Energy central role.
     For more details on this limitation see below.
 
diff --git a/src/bluetooth/osx/corebluetoothwrapper_p.h b/src/bluetooth/osx/corebluetoothwrapper_p.h
index d0b6f23c..fe057681 100644
--- a/src/bluetooth/osx/corebluetoothwrapper_p.h
+++ b/src/bluetooth/osx/corebluetoothwrapper_p.h
@@ -34,6 +34,17 @@
 #ifndef COREBLUETOOTHWRAPPER_P_H
 #define COREBLUETOOTHWRAPPER_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.
+//
+
 #ifndef QT_OSX_BLUETOOTH
 
 #import <CoreBluetooth/CoreBluetooth.h>
diff --git a/src/bluetooth/osx/osxbtcentralmanager.mm b/src/bluetooth/osx/osxbtcentralmanager.mm
index 08905da8..614e4ae5 100644
--- a/src/bluetooth/osx/osxbtcentralmanager.mm
+++ b/src/bluetooth/osx/osxbtcentralmanager.mm
@@ -201,8 +201,8 @@ using namespace QT_NAMESPACE;
         return QLowEnergyController::ConnectionError;
     }
 
-#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_9, __IPHONE_6_0)
-    if (QSysInfo::MacintoshVersion >= qt_OS_limit(QSysInfo::MV_10_9, QSysInfo::MV_IOS_6_0)) {
+#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_9, __IPHONE_7_0)
+    if (QSysInfo::MacintoshVersion >= qt_OS_limit(QSysInfo::MV_10_9, QSysInfo::MV_IOS_7_0)) {
         const quint128 qtUuidData(deviceUuid.toUInt128());
         // STATIC_ASSERT on sizes would be handy!
         uuid_t uuidData = {};
@@ -229,6 +229,12 @@ using namespace QT_NAMESPACE;
         return QLowEnergyController::NoError;
     }
 #endif
+    // Either SDK or the target is below 10.9/7.0
+    if (![manager respondsToSelector:@selector(retrievePeripherals:)]) {
+        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "failed to retrive a peripheral";
+        return QLowEnergyController::UnknownRemoteDeviceError;
+    }
+
     OSXBluetooth::CFStrongReference<CFUUIDRef> cfUuid(OSXBluetooth::cf_uuid(deviceUuid));
     if (!cfUuid) {
         qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "failed to create CFUUID object";
@@ -238,7 +244,7 @@ using namespace QT_NAMESPACE;
     [uuids addObject:(id)cfUuid.data()];
     // Unfortunately, with old Core Bluetooth this call is asynchronous ...
     managerState = OSXBluetooth::CentralManagerConnecting;
-    [manager retrievePeripherals:uuids];
+    [manager performSelector:@selector(retrievePeripherals:) withObject:uuids.data()];
 
     return QLowEnergyController::NoError;
 }
@@ -272,7 +278,12 @@ using namespace QT_NAMESPACE;
     if (QSysInfo::MacintoshVersion >= qt_OS_limit(QSysInfo::MV_10_9, QSysInfo::MV_IOS_7_0))
         return peripheral.state == CBPeripheralStateConnected;
 #endif
-    return peripheral.isConnected;
+    // Either SDK or the target is below 10.9/7.0 ...
+    if (![peripheral respondsToSelector:@selector(isConnected)])
+        return false;
+
+    // Ugly cast to deal with id being a pointer ...
+    return reinterpret_cast<quintptr>([peripheral performSelector:@selector(isConnected)]);
 }
 
 - (void)disconnectFromDevice
diff --git a/src/bluetooth/osx/osxbtcentralmanager_p.h b/src/bluetooth/osx/osxbtcentralmanager_p.h
index e8d7d234..429bae91 100644
--- a/src/bluetooth/osx/osxbtcentralmanager_p.h
+++ b/src/bluetooth/osx/osxbtcentralmanager_p.h
@@ -34,6 +34,17 @@
 #ifndef OSXBTCENTRALMANAGER_P_H
 #define OSXBTCENTRALMANAGER_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 "qlowenergycontroller.h"
 #include "qlowenergyservice.h"
 #include "qbluetoothuuid.h"
diff --git a/src/bluetooth/osx/osxbtchanneldelegate_p.h b/src/bluetooth/osx/osxbtchanneldelegate_p.h
index edcf6950..d489ce4e 100644
--- a/src/bluetooth/osx/osxbtchanneldelegate_p.h
+++ b/src/bluetooth/osx/osxbtchanneldelegate_p.h
@@ -34,6 +34,17 @@
 #ifndef OSXBTCHANNELDELEGATE_P_H
 #define OSXBTCHANNELDELEGATE_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/qglobal.h>
 
 #include <IOKit/IOReturn.h>
diff --git a/src/bluetooth/osx/osxbtconnectionmonitor_p.h b/src/bluetooth/osx/osxbtconnectionmonitor_p.h
index 4ad28885..38403ca5 100644
--- a/src/bluetooth/osx/osxbtconnectionmonitor_p.h
+++ b/src/bluetooth/osx/osxbtconnectionmonitor_p.h
@@ -34,6 +34,17 @@
 #ifndef OSXBTCONNECTIONMONITOR_P_H
 #define OSXBTCONNECTIONMONITOR_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 "qbluetoothaddress.h"
 
 #include <QtCore/qglobal.h>
diff --git a/src/bluetooth/osx/osxbtdeviceinquiry_p.h b/src/bluetooth/osx/osxbtdeviceinquiry_p.h
index 4397b45d..9589eaff 100644
--- a/src/bluetooth/osx/osxbtdeviceinquiry_p.h
+++ b/src/bluetooth/osx/osxbtdeviceinquiry_p.h
@@ -34,6 +34,17 @@
 #ifndef OSXBTDEVICEINQUIRY_P_H
 #define OSXBTDEVICEINQUIRY_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/qglobal.h>
 
 // We have to import objc code (it does not have inclusion guards).
diff --git a/src/bluetooth/osx/osxbtdevicepair_p.h b/src/bluetooth/osx/osxbtdevicepair_p.h
index a2aa2de0..6a297eff 100644
--- a/src/bluetooth/osx/osxbtdevicepair_p.h
+++ b/src/bluetooth/osx/osxbtdevicepair_p.h
@@ -34,6 +34,17 @@
 #ifndef OSXBTDEVICEPAIR_P_H
 #define OSXBTDEVICEPAIR_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 "qbluetoothaddress.h"
 #include "osxbtutility_p.h"
 
diff --git a/src/bluetooth/osx/osxbtl2capchannel_p.h b/src/bluetooth/osx/osxbtl2capchannel_p.h
index 9736bd1d..d46584cf 100644
--- a/src/bluetooth/osx/osxbtl2capchannel_p.h
+++ b/src/bluetooth/osx/osxbtl2capchannel_p.h
@@ -34,6 +34,17 @@
 #ifndef OSXBTL2CAPCHANNEL_P_H
 #define OSXBTL2CAPCHANNEL_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/qglobal.h>
 
 #include <Foundation/Foundation.h>
diff --git a/src/bluetooth/osx/osxbtledeviceinquiry.mm b/src/bluetooth/osx/osxbtledeviceinquiry.mm
index af304d8d..c46c68fc 100644
--- a/src/bluetooth/osx/osxbtledeviceinquiry.mm
+++ b/src/bluetooth/osx/osxbtledeviceinquiry.mm
@@ -295,8 +295,8 @@ using namespace QT_NAMESPACE;
 
     Q_ASSERT_X(delegate, Q_FUNC_INFO, "invalid delegate (null)");
 
-#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_9, __IPHONE_6_0)
-    if (QSysInfo::MacintoshVersion >= qt_OS_limit(QSysInfo::MV_10_9, QSysInfo::MV_IOS_6_0)) {
+#if QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_9, __IPHONE_7_0)
+    if (QSysInfo::MacintoshVersion >= qt_OS_limit(QSysInfo::MV_10_9, QSysInfo::MV_IOS_7_0)) {
         if (!peripheral.identifier) {
             qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "peripheral without NSUUID";
             return;
@@ -310,15 +310,25 @@ using namespace QT_NAMESPACE;
         return;
     }
 #endif
-    if (!peripheral.UUID) {
-        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "peripheral without UUID";
+    // Either SDK or the target is below 10.9/7.0:
+    // The property UUID was finally removed in iOS 9, we have
+    // to avoid compilation errors ...
+    CFUUIDRef cfUUID = Q_NULLPTR;
+
+    if ([peripheral respondsToSelector:@selector(UUID)]) {
+        // This will require a bridged cast if we switch to ARC ...
+        cfUUID = reinterpret_cast<CFUUIDRef>([peripheral performSelector:@selector(UUID)]);
+    }
+
+    if (!cfUUID) {
+        qCWarning(QT_BT_OSX) << Q_FUNC_INFO << "peripheral without CFUUID";
         return;
     }
 
-    StringStrongReference key(uuid_as_nsstring(peripheral.UUID));
+    StringStrongReference key(uuid_as_nsstring(cfUUID));
     if (![peripherals objectForKey:key.data()]) {
         [peripherals setObject:peripheral forKey:key.data()];
-        const QBluetoothUuid deviceUuid(OSXBluetooth::qt_uuid(peripheral.UUID));
+        const QBluetoothUuid deviceUuid(OSXBluetooth::qt_uuid(cfUUID));
         delegate->LEdeviceFound(peripheral, deviceUuid, advertisementData, RSSI);
     }
 }
diff --git a/src/bluetooth/osx/osxbtledeviceinquiry_p.h b/src/bluetooth/osx/osxbtledeviceinquiry_p.h
index 7e6d0c8f..ca70bcc1 100644
--- a/src/bluetooth/osx/osxbtledeviceinquiry_p.h
+++ b/src/bluetooth/osx/osxbtledeviceinquiry_p.h
@@ -34,6 +34,17 @@
 #ifndef OSXBTLEDEVICEINQUIRY_P_H
 #define OSXBTLEDEVICEINQUIRY_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 "qbluetoothdevicediscoveryagent.h"
 
 #include <QtCore/qdatetime.h>
diff --git a/src/bluetooth/osx/osxbtrfcommchannel_p.h b/src/bluetooth/osx/osxbtrfcommchannel_p.h
index 80758ab0..5da685b2 100644
--- a/src/bluetooth/osx/osxbtrfcommchannel_p.h
+++ b/src/bluetooth/osx/osxbtrfcommchannel_p.h
@@ -34,6 +34,17 @@
 #ifndef OSXBTRFCOMMCHANNEL_P_H
 #define OSXBTRFCOMMCHANNEL_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/qglobal.h>
 
 #include <Foundation/Foundation.h>
diff --git a/src/bluetooth/osx/osxbtsdpinquiry_p.h b/src/bluetooth/osx/osxbtsdpinquiry_p.h
index 20b6c66c..1744c3f5 100644
--- a/src/bluetooth/osx/osxbtsdpinquiry_p.h
+++ b/src/bluetooth/osx/osxbtsdpinquiry_p.h
@@ -34,6 +34,17 @@
 #ifndef OSXBTSDPINQUIRY_H
 #define OSXBTSDPINQUIRY_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 "qbluetoothaddress.h"
 #include "qbluetoothuuid.h"
 
diff --git a/src/bluetooth/osx/osxbtservicerecord_p.h b/src/bluetooth/osx/osxbtservicerecord_p.h
index fa84147b..dd45953d 100644
--- a/src/bluetooth/osx/osxbtservicerecord_p.h
+++ b/src/bluetooth/osx/osxbtservicerecord_p.h
@@ -34,6 +34,17 @@
 #ifndef OSXBTSERVICERECORD_P_H
 #define OSXBTSERVICERECORD_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 "osxbtutility_p.h"
 
 #include <QtCore/qglobal.h>
diff --git a/src/bluetooth/osx/osxbtsocketlistener_p.h b/src/bluetooth/osx/osxbtsocketlistener_p.h
index e4fd8882..535153c7 100644
--- a/src/bluetooth/osx/osxbtsocketlistener_p.h
+++ b/src/bluetooth/osx/osxbtsocketlistener_p.h
@@ -34,6 +34,17 @@
 #ifndef OSXBTSOCKETLISTENER_P_H
 #define OSXBTSOCKETLISTENER_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/qglobal.h>
 
 #include <Foundation/Foundation.h>
diff --git a/src/bluetooth/osx/osxbtutility_p.h b/src/bluetooth/osx/osxbtutility_p.h
index 18d8732a..a69e05c2 100644
--- a/src/bluetooth/osx/osxbtutility_p.h
+++ b/src/bluetooth/osx/osxbtutility_p.h
@@ -34,6 +34,17 @@
 #ifndef OSXBTUTILITY_P_H
 #define OSXBTUTILITY_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/qloggingcategory.h>
 #include <QtCore/qscopedpointer.h>
 #include <QtCore/qsysinfo.h>
diff --git a/src/bluetooth/osx/uistrings_p.h b/src/bluetooth/osx/uistrings_p.h
index 303bad89..f5b1b695 100644
--- a/src/bluetooth/osx/uistrings_p.h
+++ b/src/bluetooth/osx/uistrings_p.h
@@ -34,6 +34,17 @@
 #ifndef TRANSLATIONS_H
 #define TRANSLATIONS_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/QCoreApplication>
 #include <QtCore/QString>
 
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
index b0fd88d5..18accdf5 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
@@ -253,6 +253,8 @@ void QBluetoothDeviceDiscoveryAgentPrivate::startBluez5()
                         continue; //devices whose path doesn't start with same path we skip
 
                     deviceFoundBluez5(path.path());
+                    if (!isActive()) // Can happen if stop() was called from a slot in user code.
+                      return;
                 }
             }
         }
diff --git a/src/bluetooth/qbluetoothdevicediscoverytimer_osx_p.h b/src/bluetooth/qbluetoothdevicediscoverytimer_osx_p.h
index 1537d82e..da1c9478 100644
--- a/src/bluetooth/qbluetoothdevicediscoverytimer_osx_p.h
+++ b/src/bluetooth/qbluetoothdevicediscoverytimer_osx_p.h
@@ -34,6 +34,17 @@
 #ifndef QBLUETOOTHDEVICEDISCOVERYTIMER_OSX_P_H
 #define QBLUETOOTHDEVICEDISCOVERYTIMER_OSX_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/qglobal.h>
 #include <QtCore/qtimer.h>
 
diff --git a/src/bluetooth/qbluetoothdeviceinfo.cpp b/src/bluetooth/qbluetoothdeviceinfo.cpp
index 37ba4e11..0a66c2c2 100644
--- a/src/bluetooth/qbluetoothdeviceinfo.cpp
+++ b/src/bluetooth/qbluetoothdeviceinfo.cpp
@@ -614,6 +614,11 @@ void QBluetoothDeviceInfo::setDeviceUuid(const QBluetoothUuid &uuid)
 /*!
    Returns a unique identifier for a Bluetooth device without an address.
 
+   In general, this uuid is invalid on every platform but OS X and iOS.
+   It is used as a workaround for those two platforms as they do not
+   provide Bluetooth addresses for found Bluetooth Low Energy devices.
+   Every other platform uses \l address() instead.
+
    \sa setDeviceUuid()
    \since 5.5
   */
diff --git a/src/bluetooth/qbluetoothserver_osx_p.h b/src/bluetooth/qbluetoothserver_osx_p.h
index 6aed892c..14755724 100644
--- a/src/bluetooth/qbluetoothserver_osx_p.h
+++ b/src/bluetooth/qbluetoothserver_osx_p.h
@@ -34,6 +34,17 @@
 #ifndef QBLUETOOTHSERVER_OSX_P_H
 #define QBLUETOOTHSERVER_OSX_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.
+//
+
 #ifdef QT_OSX_BLUETOOTH
 
 #include "osx/osxbtsocketlistener_p.h"
diff --git a/src/bluetooth/qbluetoothsocket_osx_p.h b/src/bluetooth/qbluetoothsocket_osx_p.h
index 8507620a..cfd653d3 100644
--- a/src/bluetooth/qbluetoothsocket_osx_p.h
+++ b/src/bluetooth/qbluetoothsocket_osx_p.h
@@ -34,6 +34,17 @@
 #ifndef QBLUETOOTHSOCKET_OSX_P_H
 #define QBLUETOOTHSOCKET_OSX_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.
+//
+
 #ifdef QT_OSX_BLUETOOTH
 
 #include "osx/osxbtchanneldelegate_p.h"
diff --git a/src/bluetooth/qbluetoothtransferreply_osx_p.h b/src/bluetooth/qbluetoothtransferreply_osx_p.h
index 74c1630e..7ccc9468 100644
--- a/src/bluetooth/qbluetoothtransferreply_osx_p.h
+++ b/src/bluetooth/qbluetoothtransferreply_osx_p.h
@@ -34,6 +34,17 @@
 #ifndef QBLUETOOTHTRANSFERREPLY_OSX_P_H
 #define QBLUETOOTHTRANSFERREPLY_OSX_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 "qbluetoothservicediscoveryagent.h"
 #include "qbluetoothtransferreply.h"
 
diff --git a/src/bluetooth/qlowenergycontroller_osx_p.h b/src/bluetooth/qlowenergycontroller_osx_p.h
index 1a4d5707..1c1cb1cd 100644
--- a/src/bluetooth/qlowenergycontroller_osx_p.h
+++ b/src/bluetooth/qlowenergycontroller_osx_p.h
@@ -34,6 +34,17 @@
 #ifndef QLOWENERGYCONTROLLER_OSX_P_H
 #define QLOWENERGYCONTROLLER_OSX_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 "qlowenergyserviceprivate_p.h"
 #include "osx/osxbtcentralmanager_p.h"
 #include "qlowenergycontroller_p.h"
diff --git a/src/bluetooth/qlowenergycontroller_p.h b/src/bluetooth/qlowenergycontroller_p.h
index 810f0ff4..f587d3f9 100644
--- a/src/bluetooth/qlowenergycontroller_p.h
+++ b/src/bluetooth/qlowenergycontroller_p.h
@@ -34,6 +34,17 @@
 #ifndef QLOWENERGYCONTROLLERPRIVATE_P_H
 #define QLOWENERGYCONTROLLERPRIVATE_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.
+//
+
 #if defined(QT_OSX_BLUETOOTH) || defined(QT_IOS_BLUETOOTH)
 
 #include <QtCore/qglobal.h>
diff --git a/src/bluetooth/qlowenergyserviceprivate_p.h b/src/bluetooth/qlowenergyserviceprivate_p.h
index 0232b912..fc2276e6 100644
--- a/src/bluetooth/qlowenergyserviceprivate_p.h
+++ b/src/bluetooth/qlowenergyserviceprivate_p.h
@@ -34,6 +34,17 @@
 #ifndef QLOWENERGYSERVICEPRIVATE_P_H
 #define QLOWENERGYSERVICEPRIVATE_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 <QtCore/QPointer>
 #include <QtBluetooth/qbluetooth.h>
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>