Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: I42bfb38e5a9bf03b43636309fe9e29e8d772bb06

6 files changed, 56 insertions, 1 deletions

diff --git a/src/webchannel/doc/qtwebchannel.qdocconf b/src/webchannel/doc/qtwebchannel.qdocconf
index cfb47e4..fc036d2 100644
--- a/src/webchannel/doc/qtwebchannel.qdocconf
+++ b/src/webchannel/doc/qtwebchannel.qdocconf
@@ -4,7 +4,7 @@ project                                             = QtWebChannel
 description                                         = Qt WebChannel Reference Documentation
 version                                             = $QT_VERSION
 
-examplesinstallpath                                 = webchannel
+examplesinstallpath                                 = qtwebchannel/webchannel
 
 qhp.projects                                        = QtWebChannel
 
diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h
index dfe5b89..f5109b6 100644
--- a/src/webchannel/qmetaobjectpublisher_p.h
+++ b/src/webchannel/qmetaobjectpublisher_p.h
@@ -40,6 +40,17 @@
 #ifndef QMETAOBJECTPUBLISHER_P_H
 #define QMETAOBJECTPUBLISHER_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 "variantargument_p.h"
 #include "signalhandler_p.h"
 
diff --git a/src/webchannel/qqmlwebchannelattached_p.h b/src/webchannel/qqmlwebchannelattached_p.h
index 18f3d8a..403b205 100644
--- a/src/webchannel/qqmlwebchannelattached_p.h
+++ b/src/webchannel/qqmlwebchannelattached_p.h
@@ -40,6 +40,17 @@
 #ifndef QQMLWEBCHANNELATTACHED_H
 #define QQMLWEBCHANNELATTACHED_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 "qwebchannelglobal.h"
diff --git a/src/webchannel/qwebchannel_p.h b/src/webchannel/qwebchannel_p.h
index 1c82d86..28893ad 100644
--- a/src/webchannel/qwebchannel_p.h
+++ b/src/webchannel/qwebchannel_p.h
@@ -40,6 +40,17 @@
 #ifndef QWEBCHANNEL_P_H
 #define QWEBCHANNEL_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 "qwebchannelglobal.h"
 
 #include <private/qobject_p.h>
diff --git a/src/webchannel/signalhandler_p.h b/src/webchannel/signalhandler_p.h
index 01941df..b6c316b 100644
--- a/src/webchannel/signalhandler_p.h
+++ b/src/webchannel/signalhandler_p.h
@@ -40,6 +40,17 @@
 #ifndef SIGNALHANDLER_H
 #define SIGNALHANDLER_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 <QHash>
 #include <QVector>
diff --git a/src/webchannel/variantargument_p.h b/src/webchannel/variantargument_p.h
index af812a8..263a742 100644
--- a/src/webchannel/variantargument_p.h
+++ b/src/webchannel/variantargument_p.h
@@ -40,6 +40,17 @@
 #ifndef VARIANTARGUMENT_H
 #define VARIANTARGUMENT_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 <QVariant>
 
 QT_BEGIN_NAMESPACE