From 190c45da3e6e76d2d84c1a2b7621cd60a8d3d703 Mon Sep 17 00:00:00 2001
From: victor <43309235@qq.com>
Date: Wed, 5 Oct 2022 13:05:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=20=E4=B8=8D=E8=AE=BE=E7=BD=AECMAKE=5FBUI?=
 =?UTF-8?q?LD=5FTYPE=EF=BC=8C=E4=BE=BF=E4=BA=8E=E8=B0=83=E8=AF=95=E3=80=82?=
 =?UTF-8?q?=202.=20=E6=B7=BB=E5=8A=A0=E7=BC=BA=E5=A4=B1=E7=9A=84Qt5::WinEx?=
 =?UTF-8?q?tras=E5=8C=85=E3=80=82=203.=20=E4=BF=AE=E5=A4=8D=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E6=96=87=E4=BB=B6applogo.rc=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb9be42b..1d7b0b17 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)
@@ -548,7 +549,7 @@ if(WIN32)
 	set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILER} -O coff -I${CMAKE_CURRENT_SOURCE_DIR} <SOURCE> <OBJECT>")
 	enable_language(RC)
 	# app icon
-	list(APPEND DSView_SOURCES DSView/applogo.rc)
+        list(APPEND DSView_SOURCES applogo.rc)
 endif()
 
 if(Qt5Core_FOUND)
@@ -593,7 +594,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)

From 624cda3c705d2ff4781cd6453d9158b7948491fe Mon Sep 17 00:00:00 2001
From: victor <43309235@qq.com>
Date: Wed, 5 Oct 2022 13:05:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8DQT5.15.6=E4=B8=ADQTe?=
 =?UTF-8?q?xtCodec::codecForName("System")=E8=BF=94=E5=9B=9E=E4=B8=BA0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DSView/pv/utility/path.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
+}