diff options
author | Milian Wolff <milian.wolff@kdab.com> | 2014-01-15 16:35:38 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 13:02:04 +0100 |
commit | a3463f8c873f19f9b2aff66d9a633739bb633128 (patch) | |
tree | 0726e3bd92e01d49bc1c9f3bc9151b81fad1495c /src/imports/webchannel | |
parent | 00a91c1bab7a121af67f279c06710259fedebeb6 (diff) | |
download | qtwebchannel-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/imports/webchannel')
-rw-r--r-- | src/imports/webchannel/plugin.cpp | 4 | ||||
-rw-r--r-- | src/imports/webchannel/qmlwebchannel.cpp | 2 | ||||
-rw-r--r-- | src/imports/webchannel/qmlwebchannel.h | 4 | ||||
-rw-r--r-- | src/imports/webchannel/qmlwebchannelattached.cpp | 2 | ||||
-rw-r--r-- | src/imports/webchannel/qmlwebchannelattached.h | 4 |
5 files changed, 15 insertions, 1 deletions
diff --git a/src/imports/webchannel/plugin.cpp b/src/imports/webchannel/plugin.cpp index 024a320..92aac79 100644 --- a/src/imports/webchannel/plugin.cpp +++ b/src/imports/webchannel/plugin.cpp @@ -44,7 +44,7 @@ #include "qmlwebchannel.h" -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE class QWebChannelPlugin : public QQmlExtensionPlugin { @@ -63,4 +63,6 @@ void QWebChannelPlugin::registerTypes(const char *uri) } +QT_END_NAMESPACE + #include "plugin.moc" diff --git a/src/imports/webchannel/qmlwebchannel.cpp b/src/imports/webchannel/qmlwebchannel.cpp index 71ef7c5..7c70f5c 100644 --- a/src/imports/webchannel/qmlwebchannel.cpp +++ b/src/imports/webchannel/qmlwebchannel.cpp @@ -46,6 +46,8 @@ #include <QtQml/QQmlContext> +QT_USE_NAMESPACE + QmlWebChannel::QmlWebChannel(QObject *parent) : QWebChannel(parent) { diff --git a/src/imports/webchannel/qmlwebchannel.h b/src/imports/webchannel/qmlwebchannel.h index 0f63884..bcbb9cf 100644 --- a/src/imports/webchannel/qmlwebchannel.h +++ b/src/imports/webchannel/qmlwebchannel.h @@ -51,6 +51,8 @@ #include <QtQml/qqml.h> #include <QtQml/QQmlListProperty> +QT_BEGIN_NAMESPACE + class QmlWebChannelAttached; class QmlWebChannel : public QWebChannel @@ -85,4 +87,6 @@ private: QML_DECLARE_TYPE( QmlWebChannel ) QML_DECLARE_TYPEINFO( QmlWebChannel, QML_HAS_ATTACHED_PROPERTIES ) +QT_END_NAMESPACE + #endif // QMLWEBCHANNEL_H diff --git a/src/imports/webchannel/qmlwebchannelattached.cpp b/src/imports/webchannel/qmlwebchannelattached.cpp index e4aeb5d..637feb2 100644 --- a/src/imports/webchannel/qmlwebchannelattached.cpp +++ b/src/imports/webchannel/qmlwebchannelattached.cpp @@ -41,6 +41,8 @@ #include "qmlwebchannelattached.h" +QT_USE_NAMESPACE + QmlWebChannelAttached::QmlWebChannelAttached(QObject *parent) : QObject(parent) { diff --git a/src/imports/webchannel/qmlwebchannelattached.h b/src/imports/webchannel/qmlwebchannelattached.h index 2f4b9b6..6a0d191 100644 --- a/src/imports/webchannel/qmlwebchannelattached.h +++ b/src/imports/webchannel/qmlwebchannelattached.h @@ -44,6 +44,8 @@ #include <QObject> +QT_BEGIN_NAMESPACE + class QmlWebChannelAttached : public QObject { Q_OBJECT @@ -63,4 +65,6 @@ private: QString m_id; }; +QT_END_NAMESPACE + #endif // QMLWEBCHANNELATTACHED_H |