Skip to content
Snippets Groups Projects
Commit 08144ab9 authored by andrey.daragan's avatar andrey.daragan
Browse files

Merge branch 'bugs-2586' into 'master'

[*] Increased build number.

See merge request !23
parents 0d25b4c2 54dc9e96
No related branches found
No related tags found
1 merge request!11Cellframe clone
...@@ -12,7 +12,7 @@ CONFIG += c++11 ...@@ -12,7 +12,7 @@ CONFIG += c++11
TARGET = $$BRAND TARGET = $$BRAND
VER_MAJ = 1 VER_MAJ = 1
VER_MIN = 2 VER_MIN = 5
VER_PAT = 0 VER_PAT = 0
......
...@@ -224,7 +224,7 @@ void DapCommandController::processGetCmdHistory() ...@@ -224,7 +224,7 @@ void DapCommandController::processGetCmdHistory()
void DapCommandController::processGetNetworkList() void DapCommandController::processGetNetworkList()
{ {
DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender()); DapRpcServiceReply *reply = static_cast<DapRpcServiceReply *>(sender());
QStringList result = reply->response().result().toVariant().toStringList(); QStringList result = reply->response().toJsonValue().toVariant().toStringList();
emit sendNetworkList(result); emit sendNetworkList(result);
} }
......
...@@ -13,7 +13,7 @@ DEFINES += DAP_BRAND=\\\"$$BRAND\\\" ...@@ -13,7 +13,7 @@ DEFINES += DAP_BRAND=\\\"$$BRAND\\\"
TARGET = $${BRAND}Service TARGET = $${BRAND}Service
VER_MAJ = 1 VER_MAJ = 1
VER_MIN = 0 VER_MIN = 5
VER_PAT = 0 VER_PAT = 0
ICON = icon.ico ICON = icon.ico
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment