summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-02-15 08:09:00 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-02-15 08:09:00 +0100
commite777ff1f88e58c1b47044ac83aafa8ccafa3840f (patch)
tree29587ca172418468fa4135075a7a1c21c1f3fb2c
parent3fa1c9d2cf5e00e7431d042e7955a6dd75e6e2b1 (diff)
parent92d903d92b430222cd3f89eab08d61d947e5abea (diff)
downloadqtwebchannel-e777ff1f88e58c1b47044ac83aafa8ccafa3840f.tar.gz
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: Iafa14f898762ae1134a6c9b97afaad44af621cbe
-rw-r--r--src/webchannel/qmetaobjectpublisher_p.h11
-rw-r--r--src/webchannel/qqmlwebchannelattached_p.h11
-rw-r--r--src/webchannel/qwebchannel_p.h11
-rw-r--r--src/webchannel/signalhandler_p.h11
-rw-r--r--src/webchannel/variantargument_p.h11
5 files changed, 55 insertions, 0 deletions
diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h
index 2f8a3d7..cb3350e 100644
--- a/src/webchannel/qmetaobjectpublisher_p.h
+++ b/src/webchannel/qmetaobjectpublisher_p.h
@@ -34,6 +34,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 d4fdcad..da014a3 100644
--- a/src/webchannel/qqmlwebchannelattached_p.h
+++ b/src/webchannel/qqmlwebchannelattached_p.h
@@ -34,6 +34,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 5d3bec2..1cd4eb9 100644
--- a/src/webchannel/qwebchannel_p.h
+++ b/src/webchannel/qwebchannel_p.h
@@ -34,6 +34,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 d7c64c1..971c1c9 100644
--- a/src/webchannel/signalhandler_p.h
+++ b/src/webchannel/signalhandler_p.h
@@ -34,6 +34,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 17daaf5..cd0da79 100644
--- a/src/webchannel/variantargument_p.h
+++ b/src/webchannel/variantargument_p.h
@@ -34,6 +34,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