diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:17:21 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:17:21 +0100 |
commit | a9bad172f62fe1dda280df5477a8b7c1bd57690d (patch) | |
tree | a22948b7300a57902a6e46d5346104e32c898e64 /src/webchannel/variantargument_p.h | |
parent | 9507cdc31ff6778cba77764bb0991e538c493a9e (diff) | |
parent | e777ff1f88e58c1b47044ac83aafa8ccafa3840f (diff) | |
download | qtwebchannel-a9bad172f62fe1dda280df5477a8b7c1bd57690d.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I42bfb38e5a9bf03b43636309fe9e29e8d772bb06
Diffstat (limited to 'src/webchannel/variantargument_p.h')
-rw-r--r-- | src/webchannel/variantargument_p.h | 11 |
1 files changed, 11 insertions, 0 deletions
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 |