From ed05fe3770c33ddb44c6f0abec8ae53b7a9e4f4d Mon Sep 17 00:00:00 2001
From: feiyangqingyun <feiyangqingyun@163.com>
Date: Fri, 19 Nov 2021 15:31:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                          | 2 +-
 other/dbpage/frmdbpage.cpp         | 4 +++-
 other/dbpage/main.cpp              | 4 +++-
 tool/keydemo/appkey.cpp            | 3 ++-
 tool/keydemo/frmmain.cpp           | 3 ++-
 tool/keytool/frmmain.cpp           | 3 ++-
 tool/livedemo/applive.cpp          | 1 +
 video/playffmpeg/ffmpeg/ffmpeg.pri | 4 ++++
 video/playvlc/vlc/vlc.pri          | 1 +
 9 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ee15f85..b680d0a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-#### 一、特别说明
+#### 一、特别说明
 1. 可以选择打开QWidgetDemo.pro一次性编译所有的，也可以到目录下打开pro编译。
 2. 如果发现有些子项目没有加载请打开对应目录下的.pro仔细看里面的注释。
 3. 编译好的可执行文件在源码同级目录下的bin目录。
diff --git a/other/dbpage/frmdbpage.cpp b/other/dbpage/frmdbpage.cpp
index 836391d..9c61176 100644
--- a/other/dbpage/frmdbpage.cpp
+++ b/other/dbpage/frmdbpage.cpp
@@ -1,4 +1,6 @@
-#include "frmdbpage.h"
+#pragma execution_character_set("utf-8")
+
+#include "frmdbpage.h"
 #include "ui_frmdbpage.h"
 #include "dbpage.h"
 
diff --git a/other/dbpage/main.cpp b/other/dbpage/main.cpp
index ea33e42..123c376 100644
--- a/other/dbpage/main.cpp
+++ b/other/dbpage/main.cpp
@@ -1,4 +1,6 @@
-#include "frmdbpage.h"
+#pragma execution_character_set("utf-8")
+
+#include "frmdbpage.h"
 #include "qapplication.h"
 #include "qtextcodec.h"
 #include "qsqldatabase.h"
diff --git a/tool/keydemo/appkey.cpp b/tool/keydemo/appkey.cpp
index 064be08..db1e3f9 100644
--- a/tool/keydemo/appkey.cpp
+++ b/tool/keydemo/appkey.cpp
@@ -1,4 +1,5 @@
-#include "appkey.h"
+#pragma execution_character_set("utf-8")
+#include "appkey.h"
 #include "qmutex.h"
 #include "qfile.h"
 #include "qtimer.h"
diff --git a/tool/keydemo/frmmain.cpp b/tool/keydemo/frmmain.cpp
index f3893e7..484df8f 100644
--- a/tool/keydemo/frmmain.cpp
+++ b/tool/keydemo/frmmain.cpp
@@ -1,4 +1,5 @@
-#include "frmmain.h"
+#pragma execution_character_set("utf-8")
+#include "frmmain.h"
 #include "ui_frmmain.h"
 #include "appkey.h"
 
diff --git a/tool/keytool/frmmain.cpp b/tool/keytool/frmmain.cpp
index 38f2278..a7adbd6 100644
--- a/tool/keytool/frmmain.cpp
+++ b/tool/keytool/frmmain.cpp
@@ -1,4 +1,5 @@
-#include "frmmain.h"
+#pragma execution_character_set("utf-8")
+#include "frmmain.h"
 #include "ui_frmmain.h"
 #include "qmessagebox.h"
 #include "qfile.h"
diff --git a/tool/livedemo/applive.cpp b/tool/livedemo/applive.cpp
index 7171233..78495b6 100644
--- a/tool/livedemo/applive.cpp
+++ b/tool/livedemo/applive.cpp
@@ -1,3 +1,4 @@
+#pragma execution_character_set("utf-8")
 #include "applive.h"
 #include "qmutex.h"
 #include "qudpsocket.h"
diff --git a/video/playffmpeg/ffmpeg/ffmpeg.pri b/video/playffmpeg/ffmpeg/ffmpeg.pri
index cfd8dfd..3f53d3f 100644
--- a/video/playffmpeg/ffmpeg/ffmpeg.pri
+++ b/video/playffmpeg/ffmpeg/ffmpeg.pri
@@ -6,6 +6,7 @@ SOURCES += $$PWD/ffmpeg.cpp
 DEFINES += ffmpeg4
 
 #ffmpeg4则使用ffmpeg4的目录
+
 contains(DEFINES, ffmpeg4) {
 strPath = ffmpeg4
 } else {
@@ -19,11 +20,13 @@ strInclude = include64
 } else {
 #由于Qt4不支持QT_ARCH所以会执行下面的
 #如果用的64位的Qt4则需要自行修改
+
 strLib = winlib
 strInclude = include
 }
 
 #表示arm平台构建套件
+
 contains(QT_ARCH, arm) {
 strInclude = include
 }
@@ -37,6 +40,7 @@ LIBS += -L$$PWD/$$strPath/$$strLib/ -lavcodec -lavfilter -lavformat -lswscale -l
 }
 
 #请自行替换
+
 !android {
 unix:!macx {
 LIBS += -L$$PWD/linuxlib/ -lavfilter -lavformat -lavdevice -lavcodec -lswscale -lavutil -lswresample -lavdevice -lpthread -lm -lz -lrt -ldl
diff --git a/video/playvlc/vlc/vlc.pri b/video/playvlc/vlc/vlc.pri
index adc38f0..f401d67 100644
--- a/video/playvlc/vlc/vlc.pri
+++ b/video/playvlc/vlc/vlc.pri
@@ -6,6 +6,7 @@ SOURCES += $$PWD/vlc.cpp
 DEFINES += vlc2
 
 #vlc3则使用vlc3的目录
+
 contains(DEFINES, vlc3) {
 strPath = vlc3
 } else {