Merge PR #250: Qt versions

libnymea-core/jsonrpc/jsonrpcserverimplementation.cpp

@@ -125,6 +125,8 @@ JsonRPCServerImplementation::JsonRPCServerImplementation(const QSslConfiguration
     description = "Version of this nymea/JSONRPC interface.";
     returns.insert("version", enumValueName(String));
     returns.insert("protocol version", enumValueName(String));
+    returns.insert("qtVersion", enumValueName(String));
+    returns.insert("qtBuildVersion", enumValueName(String));
     registerMethod("Version", description, params, returns);
 
     params.clear(); returns.clear();
@@ -280,6 +282,8 @@ JsonReply* JsonRPCServerImplementation::Version(const QVariantMap &params) const
     QVariantMap data;
     data.insert("version", NYMEA_VERSION_STRING);
     data.insert("protocol version", JSON_PROTOCOL_VERSION);
+    data.insert("qtVersion", qVersion());
+    data.insert("qtBuildVersion", QT_VERSION_STR);
     return createReply(data);
 }
 

tests/auto/api.json

@@ -989,6 +989,8 @@
             },
             "returns": {
                 "protocol version": "String",
+                "qtBuildVersion": "String",
+                "qtVersion": "String",
                 "version": "String"
             }
         },

tests/scripts/version.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ -z $1 ]; then
+  echo "usage: $0 host [token]"
+  exit 1
+fi
+
+if [ -z $2 ]; then
+cat <<EOD | nc $1 2222
+{"id":0, "method":"JSONRPC.Hello"}
+{"id":1, "method":"JSONRPC.Version"}
+EOD
+exit 0
+fi
+
+cat <<EOD | nc $1 2222
+{"id":0, "method":"JSONRPC.Hello"}
+{"id":1, "token": "$2", "method":"JSONRPC.Version"}
+EOD
+
+