diff --git a/.vscode/settings.json b/.vscode/settings.json index 383a49f..747de71 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -19,7 +19,7 @@ "visualizerFile": "${workspaceRoot}/.vscode/qt6.natvis" }, "cmake.environment": { - "PATH": "${env:PATH};C:/Qt/6.7.2/bin" + "PATH": "${env:PATH};C:/Qt/6.7.2/bin;C:/Qt/Qt5.14.2/5.14.2/msvc2017_64/bin" }, "cmake.options.statusBarVisibility": "visible", "cmake.generator": "Ninja", diff --git a/CMakeLists.txt b/CMakeLists.txt index 8321ea1..36cfc69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,8 +14,9 @@ message(STATUS "User home directory: ${USER_HOME}") set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} - "C:/Qt/6.7.2" "${USER_HOME}/Qt5.14.2/5.14.2/gcc_64/" + "${USER_HOME}/Qt5.14.2/5.14.2/msvc2017_64/" + "C:/Qt/6.7.2" ) set(CMAKE_AUTOUIC ON) diff --git a/conf_setting.ui b/conf_setting.ui index 9f83535..d2d28eb 100644 --- a/conf_setting.ui +++ b/conf_setting.ui @@ -6,7 +6,7 @@ 0 0 - 339 + 799 530 @@ -109,9 +109,6 @@ - - Qt::Orientation::Horizontal - 40 diff --git a/main.cpp b/main.cpp index 103c98a..333abb2 100644 --- a/main.cpp +++ b/main.cpp @@ -12,6 +12,10 @@ int main(int argc, char *argv[]) a.setStyle("fusion"); #endif +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#endif + MainWidget w; w.set_work_exe(argv[0]); w.show();