[*] Some updates and fixes

49446d51 · Dmitriy A. Gerasimov · f6acc99e · 49446d51 · 49446d51 · 49446d51
Commit 49446d51 authored 5 years ago by Dmitriy A. Gerasimov
--- a/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
+++ b/CellFrameDashboardGUI/CellFrameDashboardGUI.pro
@@ -13,7 +13,7 @@ TARGET = $$BRAND

 VER_MAJ = 1
 VER_MIN = 6
-VER_PAT = 1
+VER_PAT = 2


 win32 {

--- a/CellFrameDashboardGUI/DapServiceClientNativeLinux.cpp
+++ b/CellFrameDashboardGUI/DapServiceClientNativeLinux.cpp
@@ -21,7 +21,7 @@ DapServiceClientNativeLinux::~DapServiceClientNativeLinux()

 bool DapServiceClientNativeLinux::isServiceRunning()
 {
-    m_isServiceRunning = (::system(m_checkIsServiceRunningCommand) == 0);
+    m_isServiceRunning =true;//  (::system(m_checkIsServiceRunningCommand) == 0);
    return m_isServiceRunning;
 }


--- a/CellFrameDashboardService/CellFrameDashboardService.pro
+++ b/CellFrameDashboardService/CellFrameDashboardService.pro
@@ -14,7 +14,7 @@ TARGET = $${BRAND}Service

 VER_MAJ = 1
 VER_MIN = 6
-VER_PAT = 1
+VER_PAT = 2

 ICON = icon.ico


--- a/libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri
+++ b/libCellFrameDashboardCommon/libCellFrameDashboardCommon.pri
@@ -9,7 +9,7 @@
 # You can also select to disable deprecated APIs only up to a certain version of Qt.
 #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0

-QT += quick quickwidgets
+QT += qml quick quickwidgets
 CONFIG += c++11

 SOURCES +=\

--- a/libdap @ efd69f3c
+++ b/libdap @ efd69f3c
-Subproject commit 5b72cc303107680535c4591313033611b01c4a0b
+Subproject commit efd69f3c297f64b4b48f0a9dfeaac3ad9e449d0b
--- a/libdap-qt @ abd55f41
+++ b/libdap-qt @ abd55f41
-Subproject commit e1a60e27b1172544c5e0046322226da49e4de2d4
+Subproject commit abd55f41c4660d1e7101161616c537b3107d9abc