mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
chore: keep GDI fontengine on Windows for now (#5710)
This commit is contained in:
parent
63f363e5a9
commit
eeb797c03f
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -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
2
cmake/resources/qt.conf.in
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
[Platforms]
|
||||||
|
WindowsArguments = ${WINDOWS_ARGUMENTS}
|
|
@ -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
1
resources/.gitignore
vendored
|
@ -1 +1,2 @@
|
||||||
linuxinstall
|
linuxinstall
|
||||||
|
/qt.conf
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
[Platforms]
|
|
||||||
WindowArguments = dpiawareness=2
|
|
|
@ -1,5 +0,0 @@
|
||||||
<RCC>
|
|
||||||
<qresource prefix="/qt/etc">
|
|
||||||
<file>qt.conf</file>
|
|
||||||
</qresource>
|
|
||||||
</RCC>
|
|
|
@ -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)
|
||||||
|
|
Loading…
Reference in a new issue