diff --git a/KelvinDashboardService/DapChainHistoryHandler.cpp b/KelvinDashboardService/DapChainHistoryHandler.cpp index a9adbfbeeb1600ba26f1c8df1e80a1c1915b1745..68a3dd6b63668e3cf6cf1a913a7311057685d82b 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 46e74d94f2129292b33d3f47d5b4a81f70d59fec..748546110f063b1e602909f4622df81b0e682661 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>