summaryrefslogtreecommitdiff
path: root/src/webchannel/qwebchannel.cpp
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2014-01-15 16:35:38 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-31 13:02:04 +0100
commita3463f8c873f19f9b2aff66d9a633739bb633128 (patch)
tree0726e3bd92e01d49bc1c9f3bc9151b81fad1495c /src/webchannel/qwebchannel.cpp
parent00a91c1bab7a121af67f279c06710259fedebeb6 (diff)
downloadqtwebchannel-a3463f8c873f19f9b2aff66d9a633739bb633128.tar.gz
Fix compilation when building with namespaced Qt.
Wrap everything in the QtWebChannel module with the Qt namespace or use the Qt namespace where appropriate. Change-Id: I1ef2b2f5eb22ec5e04ca76c034ef8ebf4043b899 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/webchannel/qwebchannel.cpp')
-rw-r--r--src/webchannel/qwebchannel.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/webchannel/qwebchannel.cpp b/src/webchannel/qwebchannel.cpp
index bf90861..b51a056 100644
--- a/src/webchannel/qwebchannel.cpp
+++ b/src/webchannel/qwebchannel.cpp
@@ -48,6 +48,8 @@
#include <QJsonDocument>
#include <QJsonObject>
+QT_BEGIN_NAMESPACE
+
void QWebChannelPrivate::sendJSONMessage(const QJsonValue &id, const QJsonValue &data, bool response) const
{
QJsonObject obj;
@@ -158,3 +160,5 @@ void QWebChannel::ping() const
{
d->socket->ping();
}
+
+QT_END_NAMESPACE