diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-07-13 14:54:48 +0800 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-07-22 10:32:07 +0000 |
commit | 0610115192f4a1e4d722330bf298ccd213ca3b5f (patch) | |
tree | 253495c949abc0e4b3ff2ee109b91f6a85aa5c12 /src/imports/qmlwebsockets/qqmlwebsocketserver.h | |
parent | 086f3722777ee61f3c019ca064d4a844cf0f6fe4 (diff) | |
download | qtwebsockets-0610115192f4a1e4d722330bf298ccd213ca3b5f.tar.gz |
WebSocketServer: use int type for port
QML engine doesn't support quint16 as a QML type.
Task-number: QTBUG-46790
Change-Id: I5b01dc06a3256dd41affc035fc507082e1935cc8
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Reviewed-by: Luca Niccoli <lultimouomo@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/imports/qmlwebsockets/qqmlwebsocketserver.h')
-rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocketserver.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/qmlwebsockets/qqmlwebsocketserver.h b/src/imports/qmlwebsockets/qqmlwebsocketserver.h index 4759bc4..5d790db 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocketserver.h +++ b/src/imports/qmlwebsockets/qqmlwebsocketserver.h @@ -49,7 +49,7 @@ class QQmlWebSocketServer : public QObject, public QQmlParserStatus Q_PROPERTY(QUrl url READ url NOTIFY urlChanged) Q_PROPERTY(QString host READ host WRITE setHost NOTIFY hostChanged) - Q_PROPERTY(quint16 port READ port WRITE setPort NOTIFY portChanged) + Q_PROPERTY(int port READ port WRITE setPort NOTIFY portChanged) Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) Q_PROPERTY(QString errorString READ errorString NOTIFY errorStringChanged) Q_PROPERTY(bool listen READ listen WRITE setListen NOTIFY listenChanged) @@ -67,8 +67,8 @@ public: QString host() const; void setHost(const QString &host); - quint16 port() const; - void setPort(quint16 port); + int port() const; + void setPort(int port); QString name() const; void setName(const QString &name); @@ -86,7 +86,7 @@ Q_SIGNALS: void errorStringChanged(const QString &errorString); void urlChanged(const QUrl &url); - void portChanged(quint16 port); + void portChanged(int port); void nameChanged(const QString &name); void hostChanged(const QString &host); void listenChanged(bool listen); @@ -102,7 +102,7 @@ private: QScopedPointer<QWebSocketServer> m_server; QString m_host; QString m_name; - quint16 m_port; + int m_port; bool m_listen; bool m_accept; bool m_componentCompleted; |