diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:49:10 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:49:10 +0100 |
commit | 2348cac4fa6baab447a21286ac8680ad6829008f (patch) | |
tree | 2d2561fba0a43d1fab4499c971e66f21000ea2cf /examples | |
parent | 15627cc2232bf155d892b630b7e0cb04ce6bbe67 (diff) | |
parent | 8a370cead2f493ee961c814af96192a8db3e18e3 (diff) | |
download | qtwebsockets-2348cac4fa6baab447a21286ac8680ad6829008f.tar.gz |
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I3dec06c8b49480a8225ef3487c4c76a4fa05b01c
Diffstat (limited to 'examples')
-rw-r--r-- | examples/websockets/sslechoserver/securesocketclient.qrc | 6 | ||||
-rw-r--r-- | examples/websockets/sslechoserver/sslechoserver.cpp | 4 | ||||
-rw-r--r-- | examples/websockets/sslechoserver/sslechoserver.pro | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/examples/websockets/sslechoserver/securesocketclient.qrc b/examples/websockets/sslechoserver/securesocketclient.qrc new file mode 100644 index 0000000..448fa92 --- /dev/null +++ b/examples/websockets/sslechoserver/securesocketclient.qrc @@ -0,0 +1,6 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>localhost.cert</file> + <file>localhost.key</file> +</qresource> +</RCC> diff --git a/examples/websockets/sslechoserver/sslechoserver.cpp b/examples/websockets/sslechoserver/sslechoserver.cpp index 01ee87b..2904b9e 100644 --- a/examples/websockets/sslechoserver/sslechoserver.cpp +++ b/examples/websockets/sslechoserver/sslechoserver.cpp @@ -50,8 +50,8 @@ SslEchoServer::SslEchoServer(quint16 port, QObject *parent) : QWebSocketServer::SecureMode, this); QSslConfiguration sslConfiguration; - QFile certFile(QStringLiteral("./localhost.cert")); - QFile keyFile(QStringLiteral("./localhost.key")); + QFile certFile(QStringLiteral(":/localhost.cert")); + QFile keyFile(QStringLiteral(":/localhost.key")); certFile.open(QIODevice::ReadOnly); keyFile.open(QIODevice::ReadOnly); QSslCertificate certificate(&certFile, QSsl::Pem); diff --git a/examples/websockets/sslechoserver/sslechoserver.pro b/examples/websockets/sslechoserver/sslechoserver.pro index 2663872..a1a5275 100644 --- a/examples/websockets/sslechoserver/sslechoserver.pro +++ b/examples/websockets/sslechoserver/sslechoserver.pro @@ -15,3 +15,5 @@ HEADERS += \ sslechoserver.h OTHER_FILES += sslechoclient.html + +RESOURCES += securesocketclient.qrc |