diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:27:39 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:27:40 +0200 |
| commit | 483fe6ca7b9cc011c648c3cacb48b609d741b407 (patch) | |
| tree | 25e51dc1ff62d8516b03c81f8fd8c132dbf2890a /tests/auto | |
| parent | 8073e6dc16470c0723cc30c74a2af7fb315733d2 (diff) | |
| parent | 0610115192f4a1e4d722330bf298ccd213ca3b5f (diff) | |
| download | qtwebsockets-483fe6ca7b9cc011c648c3cacb48b609d741b407.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ia29cf611432e0be43e0eaf04384e48f68c93af3e
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml b/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml index 6018037..8c721a5 100644 --- a/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml +++ b/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml @@ -44,6 +44,7 @@ Rectangle { WebSocketServer { id: server + port: 1337 } WebSocket { |