noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: keep GDI fontengine on Windows for now (#5710)

Browse source
This commit is contained in:
nerix 2024-11-12 23:20:40 +01:00 committed by GitHub
parent 63f363e5a9
commit eeb797c03f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -129,6 +129,7 @@
- Dev: Fixed some compiler warnings. (#5672) - Dev: Fixed some compiler warnings. (#5672)
- Dev: Unified parsing of historic and live IRC messages. (#5678) - Dev: Unified parsing of historic and live IRC messages. (#5678)
- Dev: 7TV's `entitlement.reset` is now explicitly ignored. (#5685) - Dev: 7TV's `entitlement.reset` is now explicitly ignored. (#5685)
- Dev: Qt 6.8 and later now default to the GDI fontengine. (#5710)
## 2.5.1 ## 2.5.1

1
CMakeLists.txt
View file

@ -32,6 +32,7 @@ option(BUILD_TRANSLATIONS "" OFF)
option(BUILD_SHARED_LIBS "" OFF) option(BUILD_SHARED_LIBS "" OFF)
option(CHATTERINO_LTO "Enable LTO for all targets" OFF) option(CHATTERINO_LTO "Enable LTO for all targets" OFF)
option(CHATTERINO_PLUGINS "Enable ALPHA plugin support in Chatterino" OFF) option(CHATTERINO_PLUGINS "Enable ALPHA plugin support in Chatterino" OFF)
option(CHATTERINO_USE_GDI_FONTENGINE "Use the legacy GDI fontengine instead of the new DirectWrite one on Windows (Qt 6.8.0 and later)" ON)
option(CHATTERINO_UPDATER "Enable update checks" ON) option(CHATTERINO_UPDATER "Enable update checks" ON)
mark_as_advanced(CHATTERINO_UPDATER) mark_as_advanced(CHATTERINO_UPDATER)

9
cmake/resources/generate_resources.cmake
View file

@ -88,6 +88,15 @@ if (WIN32)
list(APPEND RES_AUTOGEN_FILES "${CMAKE_BINARY_DIR}/autogen/windows.rc") list(APPEND RES_AUTOGEN_FILES "${CMAKE_BINARY_DIR}/autogen/windows.rc")
endif () endif ()
set(WINDOWS_ARGUMENTS "@Invalid()") # empty QVariant() in QSettings
if (CHATTERINO_USE_GDI_FONTENGINE AND Qt${MAJOR_QT_VERSION}_VERSION VERSION_GREATER_EQUAL "6.8.0")
message(STATUS "Using legacy GDI fontengine")
set(WINDOWS_ARGUMENTS "fontengine=gdi")
endif ()
configure_file("${CMAKE_CURRENT_LIST_DIR}/qt.conf.in" "${CMAKE_SOURCE_DIR}/resources/qt.conf")
list(APPEND RES_AUTOGEN_FILES "${CMAKE_SOURCE_DIR}/resources/qt.conf")
list(APPEND RES_AUTOGEN_FILES list(APPEND RES_AUTOGEN_FILES
"${CMAKE_SOURCE_DIR}/resources/resources_autogenerated.qrc" "${CMAKE_SOURCE_DIR}/resources/resources_autogenerated.qrc"
"${CMAKE_BINARY_DIR}/autogen/ResourcesAutogen.cpp" "${CMAKE_BINARY_DIR}/autogen/ResourcesAutogen.cpp"

2
cmake/resources/qt.conf.in Normal file
View file

@ -0,0 +1,2 @@
[Platforms]
WindowsArguments = ${WINDOWS_ARGUMENTS}

3
cmake/resources/resources_autogenerated.qrc.in
View file

@ -6,4 +6,7 @@
<qresource prefix="/"> <qresource prefix="/">
@RES_RESOURCES_CONTENT@ @RES_RESOURCES_CONTENT@
</qresource> </qresource>
<qresource prefix="/qt/etc">
<file>qt.conf</file>
</qresource>
</RCC> </RCC>

1
resources/.gitignore vendored
View file

@ -1 +1,2 @@
linuxinstall linuxinstall
/qt.conf

2
resources/qt.conf
View file

@ -1,2 +0,0 @@
[Platforms]
WindowArguments = dpiawareness=2

5
resources/resources.qrc
View file

@ -1,5 +0,0 @@
<RCC>
<qresource prefix="/qt/etc">
<file>qt.conf</file>
</qresource>
</RCC>

2
src/CMakeLists.txt
View file

@ -740,8 +740,6 @@ set(SOURCE_FILES
widgets/splits/SplitInput.hpp widgets/splits/SplitInput.hpp
widgets/splits/SplitOverlay.cpp widgets/splits/SplitOverlay.cpp
widgets/splits/SplitOverlay.hpp widgets/splits/SplitOverlay.hpp
${CMAKE_SOURCE_DIR}/resources/resources.qrc
) )
if (APPLE) if (APPLE)