Skip to content

Commit 890bf04

Browse files
committed
fix: Adapted for building with Qt 6.8.3
1 parent 515f317 commit 890bf04

File tree

2 files changed

+26
-7
lines changed

2 files changed

+26
-7
lines changed

CMakeLists.txt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
cmake_minimum_required(VERSION 3.25)
2121

2222
set(project_name ChineseChess)
23-
set(project_version_major 6)
24-
set(project_version_minor 3)
23+
set(project_version_major 7)
24+
set(project_version_minor 0)
2525
set(project_version ${project_version_major}.${project_version_minor})
2626
project(${project_name} VERSION ${project_version} LANGUAGES CXX)
2727

28-
add_definitions(-DXBUILD_TIME="2023.12.14")
28+
add_definitions(-DXBUILD_TIME="2025.10.20")
2929

3030
set(CMAKE_INCLUDE_CURRENT_DIR ON)
3131
set(CMAKE_AUTOUIC ON)
@@ -40,7 +40,7 @@ file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}) # 创建输出目
4040
#set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
4141

4242
# 需要配置环境变量QT5_DIR
43-
#set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT5_DIR})
43+
# set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} $ENV{QT5_DIR})
4444

4545
set(qt_moduls Core Gui Widgets OpenGL Network Xml Svg Multimedia) # Network Multimedia WebSockets
4646
set(qt_version_moduls)
@@ -109,7 +109,13 @@ else()
109109
set(lrelease_path "${qt_binray_dir}/lrelease")
110110

111111
if(WIN32)
112-
set(windeployqt "${qt_binray_dir}/windeployqt.exe")
112+
113+
if(${QT_VERSION_MAJOR} EQUAL 6)
114+
set(windeployqt6 "${qt_binray_dir}/windeployqt6.exe")
115+
elseif(${QT_VERSION_MAJOR} EQUAL 5)
116+
set(windeployqt "${qt_binray_dir}/windeployqt.exe")
117+
endif()
118+
113119
elseif(APPLE)
114120
set(windeployqt "${qt_binray_dir}/macdeployqt")
115121
elseif(UNIX)

main.cpp

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,26 @@
4040

4141

4242
/**
43-
* @brief 环境: 本工程可以用 Qt 5.15.2 和 6.8.3 两个长期版本编译通过
43+
* @brief 环境: 本工程可以用 Qt 5.15.2 和 6.8.3 LTS 版本同时可编译通过
4444
* @param IDE: 推荐直接只用 Qt Creator 打开 CMakeLists.txt 进行构建
4545
* @param Other: 也可以自行 CMake 转 .sln 使用 Visual Studio 2022 构建
46-
* @note
46+
* @note 更多项目集: https://product.xmuli.tech/
4747
*/
4848
int main(int argc, char *argv[])
4949
{
50+
51+
// 启用高 DPI 缩放
52+
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
53+
qDebug() << "Using Qt 6 or newer";
54+
QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough); // support 1.25 1.5
55+
#else
56+
qDebug() << "Using Qt 5";
57+
// QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
58+
QGuiApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
59+
#endif
60+
61+
qApp->setOrganizationName(QStringLiteral("XMuli")); // 因多处使用 QSettings,故声明组织等信息
62+
qApp->setOrganizationDomain(QStringLiteral("github.com/XMuli"));
5063
QApplication a(argc, argv);
5164

5265
ChooseMainWindow c;

0 commit comments

Comments
 (0)