diff --git a/CMakeLists.txt b/CMakeLists.txt index 63a20b0b..d11bb56e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,11 +181,12 @@ find_package(Qt5Core QUIET) if(Qt5Core_FOUND) message("----- Qt5:") message(STATUS " includes:" ${Qt5Core_INCLUDE_DIRS}) + find_package(Qt5WinExtras REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(Qt5Gui REQUIRED) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") - set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) - set(QT_LIBRARIES Qt5::Gui Qt5::Widgets) + set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5WinExtras_INCLUDE_DIRS}) + set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::WinExtras) add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}) else() find_package(Qt6Core QUIET) @@ -543,7 +544,7 @@ if(WIN32) set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILER} -O coff -I${CMAKE_CURRENT_SOURCE_DIR} ") enable_language(RC) # app icon - list(APPEND DSView_SOURCES DSView/applogo.rc) + list(APPEND DSView_SOURCES applogo.rc) endif() if(Qt5Core_FOUND) @@ -588,7 +589,7 @@ endif() #= Release flags #------------------------------------------------------------------------------- set(CMAKE_CXX_FLAGS "-Wall -Wextra") -set(CMAKE_BUILD_TYPE Release) +#set(CMAKE_BUILD_TYPE Release) set(CMAKE_CXX_FLAGS_DEBUG "-g") set(CMAKE_CXX_FLAGS_RELEASE "-O3") add_compile_options(-O3) diff --git a/DSView/pv/utility/path.cpp b/DSView/pv/utility/path.cpp index 44dcc2b7..2a19732f 100644 --- a/DSView/pv/utility/path.cpp +++ b/DSView/pv/utility/path.cpp @@ -47,7 +47,7 @@ namespace path{ std::string str; #ifdef _WIN32 - QTextCodec *codec = QTextCodec::codecForName("System"); + QTextCodec *codec = QTextCodec::codecForLocale(); QByteArray str_tmp = codec->fromUnicode(path); str = str_tmp.data(); #else @@ -57,4 +57,4 @@ namespace path{ return str; } } -} \ No newline at end of file +}