diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-11 20:17:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-11 20:17:45 +0200 |
| commit | 825df0cef516fb84adab88a31106e214f2b29b2d (patch) | |
| tree | e6e7fb12b1c77faa65df20106c8bf342a410b690 /src/imports | |
| parent | 75042d31d1d267d0a4091932c95579747a102e9d (diff) | |
| parent | cd26439ac7ca1a444e9b5534a504afb0bb411890 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
examples/websockets/simplechat/chatserver.cpp
Change-Id: I98697cef4c05516b5b4122ad81c084546d57115f
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocket.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.h b/src/imports/qmlwebsockets/qqmlwebsocket.h index c3a808f..8db435d 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.h +++ b/src/imports/qmlwebsockets/qqmlwebsocket.h @@ -54,7 +54,6 @@ class QQmlWebSocket : public QObject, public QQmlParserStatus Q_DISABLE_COPY(QQmlWebSocket) Q_INTERFACES(QQmlParserStatus) - Q_ENUMS(Status) Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged) Q_PROPERTY(Status status READ status NOTIFY statusChanged) Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged) @@ -73,6 +72,7 @@ public: Closed = 3, Error = 4 }; + Q_ENUM(Status) QUrl url() const; void setUrl(const QUrl &url); |