From 704a4639ee8f2ca101df323c670468f5528303cb Mon Sep 17 00:00:00 2001
From: jonymt <johanmt@yandex.ru>
Date: Mon, 26 Aug 2019 17:11:36 +0200
Subject: [PATCH] [*] changed ifdef for Win
---
KelvinDashboardService/DapChainHistoryHandler.cpp | 3 ++-
KelvinDashboardService/DapChainHistoryHandler.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/KelvinDashboardService/DapChainHistoryHandler.cpp b/KelvinDashboardService/DapChainHistoryHandler.cpp
index a9adbfbee..68a3dd6b6 100644
--- a/KelvinDashboardService/DapChainHistoryHandler.cpp
+++ b/KelvinDashboardService/DapChainHistoryHandler.cpp
@@ -36,7 +36,8 @@ void DapChainHistoryHandler::onRequestNewHistory(const QMap<QString, QVariant>&
#ifdef Q_OS_LINUX
reg_str = "(\\w{3}\\s\\w{3}\\s\\d+\\s\\d{1,2}:\\d{2}:\\d{2}\\s\\d{4})\\n"
"\\s(\\w+)\\s(\\d+)\\s(\\w+)\\s\\w+\\s+(\\w+)";
-#elif Q_OS_WIN
+#endif
+#ifdef Q_OS_WIN
reg_str = "(\\w{3}\\s\\w{3}\\s\\d+\\s\\d{1,2}:\\d{2}:\\d{2}\\s\\d{4})\\r\\n"
"\\s(\\w+)\\s(\\d+)\\s(\\w+)\\s\\w+\\s+(\\w+)";
#endif
diff --git a/KelvinDashboardService/DapChainHistoryHandler.h b/KelvinDashboardService/DapChainHistoryHandler.h
index 46e74d94f..748546110 100644
--- a/KelvinDashboardService/DapChainHistoryHandler.h
+++ b/KelvinDashboardService/DapChainHistoryHandler.h
@@ -1,6 +1,7 @@
#ifndef DAPCHAINHISTORYHANDLER_H
#define DAPCHAINHISTORYHANDLER_H
+#include <QtGlobal>
#include <QObject>
#include <QVariantList>
#include <QTimer>
--
GitLab