Merge branch 'hotfix-14039' into 'master'

Hotfix 14039

See merge request !5

CMakeLists.txt

@@ -2,6 +2,35 @@ cmake_minimum_required(VERSION 3.10)
 
 project(cellframe-diagtool)
 
+if(DEFINED ENV{OSXCROSS_HOST})
+    message(STATUS "[*] Using OSXCROSS for build (OSXCROSS_HOST is set)")
+
+    SET(Qt5_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5")
+    SET(Qt5Core_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5Core")
+    SET(Qt5Qml_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5Qml")
+    SET(Qt5Network_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5Network")
+    SET(Qt5Quick_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5Quick")
+    SET(Qt5Gui_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5Gui")
+    SET(Qt5PacketProtocol_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5PacketProtocol")
+    SET(Qt5AccessibilitySupport_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5AccessibilitySupport")
+    SET(Qt5ThemeSupport_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5ThemeSupport")
+    SET(Qt5FontDatabaseSupport_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5FontDatabaseSupport")
+    SET(Qt5GraphicsSupport_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5GraphicsSupport")
+    SET(Qt5PrintSupport_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5PrintSupport")
+    SET(Qt5Widgets_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5Widgets")
+    SET(Qt5ClipboardSupport_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5ClipboardSupport")
+    SET(Qt5EventDispatcherSupport_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5EventDispatcherSupport")
+    SET(Qt5Svg_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5Svg")
+    SET(Qt5Zlib_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5Zlib")
+    SET(Qt5VirtualKeyboard_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5VirtualKeyboard")
+    SET(Qt5QmlModels_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5QmlModels")
+    SET(Qt5WebSockets_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5WebSockets")
+    SET(Qt5QuickWidgets_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5QuickWidgets")
+    SET(Qt5QuickControls2_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5QuickControls2")
+    SET(Qt5QmlWorkerScript_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5QmlWorkerScript")
+    set(Qt5QmlImportScanner_DIR "/opt/osxcross/qt-5.15.13/lib/cmake/Qt5QmlImportScanner")
+endif()
+
 find_package(Qt5 5.15 REQUIRED COMPONENTS
    Core
    Qml

CellframeNodeDiagtool/AbstractDiagnostic.cpp

@@ -4,8 +4,6 @@
 
 #elif defined(Q_OS_WIN)
 #include "registry.h"
-#elif defined(Q_OS_MACOS)
-#include "dap_common.h"
 #endif
 
 AbstractDiagnostic::AbstractDiagnostic(QObject *parent)
@@ -18,7 +16,7 @@ AbstractDiagnostic::AbstractDiagnostic(QObject *parent)
     s_nodeDataPath = QString("%1/cellframe-node").arg(regGetUsrPath());
     s_sendedDataFilePath = QString("%1/cellframe-node/lastSendedDiagData.json").arg(regGetUsrPath());
 #elif defined(Q_OS_MACOS)
-    s_nodeDataPath = QString("Applications/CellframeNode.app/Contents/Resources/");
+    s_nodeDataPath = QString("/Applications/CellframeNode.app/Contents/Resources/");
     s_sendedDataFilePath = "/tmp/lastSendedData.json";
 #endif