Merge d4fdfd15af into eeb797c03f

Bumps [jurplel/install-qt-action](https://github.com/jurplel/install-qt-action) from 4.0.0 to 4.1.1.
- [Release notes](https://github.com/jurplel/install-qt-action/releases)
- [Commits](https://github.com/jurplel/install-qt-action/compare/v4.0.0...v4.1.1)

---
updated-dependencies:
- dependency-name: jurplel/install-qt-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/build.yml

@@ -163,7 +163,7 @@ jobs:
 
       - name: Install Qt5
         if: startsWith(matrix.qt-version, '5.')
-        uses: jurplel/install-qt-action@v4.0.0
+        uses: jurplel/install-qt-action@v4.1.1
         with:
           cache: true
           cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2
@@ -171,7 +171,7 @@ jobs:
 
       - name: Install Qt6
         if: startsWith(matrix.qt-version, '6.')
-        uses: jurplel/install-qt-action@v4.0.0
+        uses: jurplel/install-qt-action@v4.1.1
         with:
           cache: true
           cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2

.github/workflows/clang-tidy.yml

@@ -30,7 +30,7 @@ jobs:
 
       - name: Install Qt6
         if: startsWith(matrix.qt-version, '6.')
-        uses: jurplel/install-qt-action@v4.0.0
+        uses: jurplel/install-qt-action@v4.1.1
         with:
           cache: true
           cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2

.github/workflows/test-macos.yml

@@ -48,7 +48,7 @@ jobs:
           fetch-depth: 0 # allows for tags access
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v4.0.0
+        uses: jurplel/install-qt-action@v4.1.1
         with:
           cache: true
           cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2

.github/workflows/test-windows.yml

@@ -58,7 +58,7 @@ jobs:
           fetch-depth: 0 # allows for tags access
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v4.0.0
+        uses: jurplel/install-qt-action@v4.1.1
         with:
           cache: true
           cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2

CHANGELOG.md

@@ -129,6 +129,7 @@
 - Dev: Fixed some compiler warnings. (#5672)
 - Dev: Unified parsing of historic and live IRC messages. (#5678)
 - 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
 

CMakeLists.txt

@@ -32,6 +32,7 @@ option(BUILD_TRANSLATIONS "" OFF)
 option(BUILD_SHARED_LIBS "" OFF)
 option(CHATTERINO_LTO "Enable LTO for all targets" 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)
 mark_as_advanced(CHATTERINO_UPDATER)

cmake/resources/generate_resources.cmake

@@ -88,6 +88,15 @@ if (WIN32)
     list(APPEND RES_AUTOGEN_FILES "${CMAKE_BINARY_DIR}/autogen/windows.rc")
 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
         "${CMAKE_SOURCE_DIR}/resources/resources_autogenerated.qrc"
         "${CMAKE_BINARY_DIR}/autogen/ResourcesAutogen.cpp"

cmake/resources/qt.conf.in

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

cmake/resources/resources_autogenerated.qrc.in

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

resources/.gitignore

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

resources/qt.conf

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

resources/resources.qrc

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

src/CMakeLists.txt

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