diff options
author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:03:47 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:03:47 +0100 |
commit | dfc91928f15302fa4e6c41802c60caec2c124942 (patch) | |
tree | 7c32786f83a45d9d8de8d989e9d54dcc0982d4e5 /tests/auto/websockets/shared/qwebsocketshared.qrc | |
parent | a0aec91b676e2b79b8e66091d55d9e128bf2a1d0 (diff) | |
parent | 670266a075c7c312c6a7f9465298bfec0b968ee2 (diff) | |
download | qtwebsockets-dfc91928f15302fa4e6c41802c60caec2c124942.tar.gz |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: If50b73b1f1e293269404bd8b38088119a0f59f1f
Diffstat (limited to 'tests/auto/websockets/shared/qwebsocketshared.qrc')
-rw-r--r-- | tests/auto/websockets/shared/qwebsocketshared.qrc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/websockets/shared/qwebsocketshared.qrc b/tests/auto/websockets/shared/qwebsocketshared.qrc new file mode 100644 index 0000000..513a87f --- /dev/null +++ b/tests/auto/websockets/shared/qwebsocketshared.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/"> + <file>localhost.cert</file> + <file>localhost.key</file> + </qresource> +</RCC> |