From 281d09a3c850350fb0ea295f5eb289b148815e20 Mon Sep 17 00:00:00 2001
From: taynpg <taynpg@163.com>
Date: Sun, 14 Jul 2024 22:39:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=BE=AE=E8=B0=83=E6=95=B4?=
=?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.vscode/settings.json | 3 +--
CMakeLists.txt | 4 +---
MainWidget.cpp | 10 +++++-----
main.cpp | 7 ++++---
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index b4207f3..f193c47 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -19,8 +19,7 @@
"visualizerFile": "${workspaceRoot}/.vscode/qt6.natvis"
},
"cmake.environment": {
- "PATH": "${env:PATH};C:/Qt/Qt6.6.3/6.6.3/msvc2019_64/bin",
- "LD_LIBRARY_PATH": "$LD_LIBRARY_PATH:/home/typ/Qt5.14.2/5.14.2/gcc_64/bin"
+ "PATH": "${env:PATH};C:/Qt/6.6.3/6.6.3/msvc2019_64/bin"
},
"cmake.options.statusBarVisibility": "visible",
"cmake.generator": "Ninja",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cce4d0..b5a4e9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,7 @@ cmake_minimum_required(VERSION 3.5)
project(OneLevelXmlOpr VERSION 0.1 LANGUAGES CXX)
set(CMAKE_PREFIX_PATH
- "C:/Qt/Qt6.6.3/6.6.3/msvc2019_64"
- "/opt/homebrew/Cellar/qt@5/5.15.13_1"
- "/home/typ/Qt5.14.2/5.14.2/gcc_64"
+ "C:/Qt/6.6.3/6.6.3/msvc2019_64"
)
set(CMAKE_AUTOUIC ON)
diff --git a/MainWidget.cpp b/MainWidget.cpp
index 894a886..2a826ac 100644
--- a/MainWidget.cpp
+++ b/MainWidget.cpp
@@ -103,11 +103,11 @@ MainWidget::MainWidget(QWidget* parent) : QWidget(parent), ui(new Ui::MainWidget
restoreGeometry(settings.value("geometry").toByteArray());
settings.endGroup();
- // QFile qss_file("://qss/lightblue.css");
- // QFile qss_file("://qss/flatgray.css");
- // if (qss_file.open(QFile::ReadOnly)) {
- // qApp->setStyleSheet(qss_file.readAll());
- // }
+ //QFile qss_file("://qss/lightblue.css");
+ // QFile qss_file("://qss/flatgray.css");
+ // if (qss_file.open(QFile::ReadOnly)) {
+ // qApp->setStyleSheet(qss_file.readAll());
+ // }
init_menu();
diff --git a/main.cpp b/main.cpp
index b38eaab..efa1be8 100644
--- a/main.cpp
+++ b/main.cpp
@@ -7,12 +7,13 @@ int main(int argc, char *argv[])
QApplication a(argc, argv);
#ifdef _WIN32
- QFont font("Microsoft YaHei", 9);
+ QFont font("Microsoft YaHei", 10);
a.setFont(font);
- //a.setStyle("fusion");
+ a.setStyle("fusion");
+#else
+ a.setStyle("windows");
#endif
- a.setStyle("windows");
MainWidget w;
w.set_work_exe(argv[0]);
w.show();