Merge remote-tracking branch 'origin/5.4' into 5.5

Change-Id: I218b5069480f60b88390c8540f01c3dbbee485d0

1 files changed, 19 insertions, 1 deletions

diff --git a/examples/websockets/echoserver/main.cpp b/examples/websockets/echoserver/main.cpp
index 3b31dde..51a684a 100644
--- a/examples/websockets/echoserver/main.cpp
+++ b/examples/websockets/echoserver/main.cpp
@@ -31,12 +31,30 @@
 **
 ****************************************************************************/
 #include <QtCore/QCoreApplication>
+#include <QtCore/QCommandLineParser>
+#include <QtCore/QCommandLineOption>
 #include "echoserver.h"
 
 int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
-    EchoServer *server = new EchoServer(1234);
+
+    QCommandLineParser parser;
+    parser.setApplicationDescription("QtWebSockets example: echoserver");
+    parser.addHelpOption();
+
+    QCommandLineOption dbgOption(QStringList() << "d" << "debug",
+            QCoreApplication::translate("main", "Debug output [default: off]."));
+    parser.addOption(dbgOption);
+    QCommandLineOption portOption(QStringList() << "p" << "port",
+            QCoreApplication::translate("main", "Port for echoserver [default: 1234]."),
+            QCoreApplication::translate("main", "port"), QLatin1Literal("1234"));
+    parser.addOption(portOption);
+    parser.process(a);
+    bool debug = parser.isSet(dbgOption);
+    int port = parser.value(portOption).toInt();
+
+    EchoServer *server = new EchoServer(port, debug);
     QObject::connect(server, &EchoServer::closed, &a, &QCoreApplication::quit);
 
     return a.exec();