From c9e1fbd1bcad0a38a8d7cbb0c8af948cb201d9f9 Mon Sep 17 00:00:00 2001 From: crueter Date: Thu, 13 Nov 2025 14:48:13 -0500 Subject: [PATCH] fix build v3 Signed-off-by: crueter --- src/qt_common/CMakeLists.txt | 4 +++- src/qt_common/qt_common.cpp | 12 ------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/qt_common/CMakeLists.txt b/src/qt_common/CMakeLists.txt index 7bb066352e..80b6c24723 100644 --- a/src/qt_common/CMakeLists.txt +++ b/src/qt_common/CMakeLists.txt @@ -83,8 +83,10 @@ add_subdirectory(externals) # pass targets find_package(frozen) -target_link_libraries(qt_common PRIVATE core Qt6::Core Qt6::Concurrent SimpleIni::SimpleIni QuaZip::QuaZip) + +target_link_libraries(qt_common PRIVATE core input_common) target_link_libraries(qt_common PRIVATE gamemode::headers) +target_link_libraries(qt_common PRIVATE Qt6::Core Qt6::Concurrent SimpleIni::SimpleIni QuaZip::QuaZip) target_link_libraries(qt_common PUBLIC frozen::frozen-headers Vulkan::UtilityHeaders) if (NOT APPLE AND ENABLE_OPENGL) diff --git a/src/qt_common/qt_common.cpp b/src/qt_common/qt_common.cpp index 4c9ab116a6..384a72b916 100644 --- a/src/qt_common/qt_common.cpp +++ b/src/qt_common/qt_common.cpp @@ -179,18 +179,6 @@ static QString PrettyProductName() { return QSysInfo::prettyProductName(); } -#ifdef _WIN32 -static void OverrideWindowsFont() { - // Qt5 chooses these fonts on Windows and they have fairly ugly alphanumeric/cyrillic characters - // Asking to use "MS Shell Dlg 2" gives better other chars while leaving the Chinese Characters. - const QString startup_font = QApplication::font().family(); - const QStringList ugly_fonts = {QStringLiteral("SimSun"), QStringLiteral("PMingLiU")}; - if (ugly_fonts.contains(startup_font)) { - QApplication::setFont(QFont(QStringLiteral("MS Shell Dlg 2"), 9, QFont::Normal)); - } -} -#endif - static void RemoveCachedContents() { const auto cache_dir = Common::FS::GetEdenPath(Common::FS::EdenPath::CacheDir); const auto offline_fonts = cache_dir / "fonts";