summaryrefslogtreecommitdiff
path: root/src/imports
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2014-06-26 15:08:01 +0200
committerMilian Wolff <milian.wolff@kdab.com>2014-06-26 15:32:55 +0200
commit6e2b5470dd1606c23ddf237d1b471530280e842c (patch)
tree13b8c03f4b8a77bf145e3d14136d915468567e48 /src/imports
parent48e814442e6e8507aacd16362b44d5754c059228 (diff)
downloadqtwebchannel-6e2b5470dd1606c23ddf237d1b471530280e842c.tar.gz
Fix public headers for use with QT_NO_KEYWORDS
QtWebEngineCore has to build that way, so we better make sure the two can play nicely together. Change-Id: Ibab5a2d042b3c8ea230922aeca6768ffec2ca452 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/webchannel/qmlwebchannel.h2
-rw-r--r--src/imports/webchannel/qmlwebchannelattached.h2
-rw-r--r--src/imports/webchannel/qmlwebviewtransport.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/webchannel/qmlwebchannel.h b/src/imports/webchannel/qmlwebchannel.h
index d5adf1d..3610307 100644
--- a/src/imports/webchannel/qmlwebchannel.h
+++ b/src/imports/webchannel/qmlwebchannel.h
@@ -78,7 +78,7 @@ public:
Q_INVOKABLE void connectTo(QObject *transport);
Q_INVOKABLE void disconnectFrom(QObject *transport);
-private slots:
+private Q_SLOTS:
void objectIdChanged(const QString &newId);
void transportDestroyed(QObject *transport);
diff --git a/src/imports/webchannel/qmlwebchannelattached.h b/src/imports/webchannel/qmlwebchannelattached.h
index 6a0d191..3d60122 100644
--- a/src/imports/webchannel/qmlwebchannelattached.h
+++ b/src/imports/webchannel/qmlwebchannelattached.h
@@ -58,7 +58,7 @@ public:
QString id() const;
void setId(const QString &id);
-signals:
+Q_SIGNALS:
void idChanged(const QString &id);
private:
diff --git a/src/imports/webchannel/qmlwebviewtransport.h b/src/imports/webchannel/qmlwebviewtransport.h
index bb1e27e..8fbfdd9 100644
--- a/src/imports/webchannel/qmlwebviewtransport.h
+++ b/src/imports/webchannel/qmlwebviewtransport.h
@@ -62,11 +62,11 @@ public:
void setWebViewExperimental(QObject *webViewExperimental);
QObject *webViewExperimental() const;
-signals:
+Q_SIGNALS:
void webViewChanged(QObject *webViewExperimental);
void messageReceived(const QString &message);
-private slots:
+private Q_SLOTS:
void handleWebViewMessage(const QVariantMap &message);
private: