[Qt][LOGGER] Fix locake for time-string.

diff --git a/source/build-cmake/cmake/config_commonsource.cmake b/source/build-cmake/cmake/config_commonsource.cmake
index 0d4c2c4..2b907c3 100644 (file)
--- a/source/build-cmake/cmake/config_commonsource.cmake
+++ b/source/build-cmake/cmake/config_commonsource.cmake
@@ -124,6 +124,7 @@ add_definitions(-DUSE_QT)
 add_definitions(-DQT_MAJOR_VERSION=${Qt5Widgets_VERSION_MAJOR})
 add_definitions(-DQT_MINOR_VERSION=${Qt5Widgets_VERSION_MINOR})
 
+
 if(USE_OPENMP)
   find_package(OpenMP)
   include_directories(${OPENMP_INCLUDE_PATH})
@@ -229,6 +230,7 @@ endif()
 if(LIBAV_FOUND)
    include_directories(${LIBAV_INCLUDE_DIRS})
 endif()
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../src/qt/common)
@@ -241,6 +243,13 @@ endif()
 add_subdirectory(../../src common)
 add_subdirectory(../../src/vm vm/)
 
+#add_custom_command(OUTPUT test.txt
+#          COMMAND grep ARGS -m 1 THIS_LIB_VERSION ${CMAKE_CURRENT_SOURCE_DIR}/../../src/vm/fmgen/CMakeLists.txt
+#        COMMAND sed ARGS "-r" "'s/.*THIS_VERSION\ //'" 
+#        COMMAND sed ARGS "-r" "'s/\).*$//'"
+#        )
+
+
 if(DEFINED VM_NAME)
 # if(WITH_DEBUGGER)
    set(DEBUG_LIBS qt_debugger)
@@ -253,6 +262,7 @@ if(DEFINED VM_NAME)
        else()
          if(USE_FMGEN)
                set(VM_APPEND_LIBS fmgen ${VM_APPEND_LIBS})
+
          else()
                set(VM_APPEND_LIBS ${VM_APPEND_LIBS})
          endif()

diff --git a/source/src/qt/gui/csp_logger.cpp b/source/src/qt/gui/csp_logger.cpp
index 888b2ac..afabefd 100644 (file)
--- a/source/src/qt/gui/csp_logger.cpp
+++ b/source/src/qt/gui/csp_logger.cpp
@@ -248,7 +248,7 @@ void CSP_Logger::debug_log(int level, int domain_num, char *strbuf)
                        strftime(strbuf2, 255, "%Y-%m-%d %H:%M:%S", timedat);
                        snprintf(strbuf3, 23, ".%06ld", tv.tv_usec);
                }
-               QString time_s = QString::fromUtf8(strbuf2) + QString::fromUtf8(strbuf3);
+               QString time_s = QString::fromLocal8Bit(strbuf2) + QString::fromLocal8Bit(strbuf3);
                
                int cons_log_level_n = (1 << level) & cons_log_levels;
                int sys_log_level_n = (1 << level) & sys_log_levels;