[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [osx-integration/qt590] /: Add a CMake option to indicate that Infinality patches have been applied 
From:       R.J.V. Bertin <null () kde ! org>
Date:       2017-12-30 22:42:11
Message-ID: E1eVPpT-0004mK-T9 () code ! kde ! org
[Download RAW message or body]

Git commit 5ef806d6081f0993a6bc2d849da82a5256b08371 by R.J.V. Bertin.
Committed on 30/12/2017 at 22:15.
Pushed by rjvbb into branch 'qt590'.

Add a CMake option to indicate that Infinality patches have been applied to=
 the local FreeType *and* FontConfig install

Committed from host : Portia.local

M  +4    -0    CMakeLists.txt
M  +10   -1    README.md
M  +3    -0    src/qcocoa-qpa/CMakeLists.txt

https://commits.kde.org/osx-integration/5ef806d6081f0993a6bc2d849da82a5256b=
08371

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab7d6d5..080c892 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,10 @@ option(EMULATE_MENU_KEY
         "Emulate the presence of a Menu key as on PC keyboards when the ri=
ght Command+Option keys are pressed.
         BUILD_QT_PLUGINS must be set for this to have any effect."
         OFF)
+option(HAVE_INFINALITY
+        "The Infinality+Ultimate patch set has been applied to FreeType an=
d FontConfig.
+        (the FontConfig patches are determining). See https://github.com/a=
rchfan/infinality_bundle"
+        OFF)
 =

 option(USE_PLCRASHREPORTER
         "Use the Plausible CrashReporter (https://www.plcrashreporter.org)"
diff --git a/README.md b/README.md
index 90580a5..7b580bb 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,11 @@ attached monitors but keeps their content visible and ac=
cessible. It's also a
 lot faster and supports opening new windows without side-effects when in
 fullscreen mode. Selecting the FreeType engine has been made easier via an=
 env.
 variable (QT_MAC_USE_FREETYPE) as well as an integration function that can=
 be
-called from application code (see kfontsettingsdatamac.mm).
+called from application code (see kfontsettingsdatamac.mm). There's also s=
upport
+for activating the FontConfig fontengine/database (QT_MAC_USE_FONTCONFIG) =
but
+this requires a patched QtBase configured to use FontConfig. Both use a fo=
nt
+gamma setting that determines font darkness and can be set via the env. var
+QT_MAC_FREETYPE_FONT_GAMMA .
 This plugin installs next to and will be loaded instead of the stock plugi=
n; it
 will then give priority to the modified QMacStyle if that is installed. If=
 the
 KDE platform theme plugin is built in override mode (see above) this plugi=
n is
@@ -81,3 +85,8 @@ this is also the only way to build the KDE platform theme=
 plugin component.
 - DISABLE_DBUS_SUPPORT : Don't build the D-Bus functionality. Experimental!
 - EMULATE_MENU_KEY : emulate a Menu key (right Command+Option key-combo); =
requires
   BUILD_QT_PLUGINS to be set in order for that keypress to open the contex=
t menu.
+
+* CMake options for QCocoaQPA :
+- HAVE_INFINALITY : should be enabled when you have the Infinality+Ultimat=
e patch-set
+  applied to FreeType *and* FontConfig. Without this option fonts will pro=
bably look
+  washed out.
diff --git a/src/qcocoa-qpa/CMakeLists.txt b/src/qcocoa-qpa/CMakeLists.txt
index 32d6add..d3f0f04 100644
--- a/src/qcocoa-qpa/CMakeLists.txt
+++ b/src/qcocoa-qpa/CMakeLists.txt
@@ -32,6 +32,9 @@ if(Qt5_FOUND AND (NOT ${Qt5_VERSION} VERSION_LESS ${QT_RE=
AL_MIN_VERSION}))
             -DQT_NO_CAST_TO_ASCII
             -DQT_NO_URL_CAST_FROM_STRING)
         add_definitions(-DQT_PLUGIN)
+        if(HAVE_INFINALITY)
+            add_definitions(-DHAVE_INFINALITY)
+        endif()
         include(FindPkgConfig)
         pkg_check_modules(FREETYPE REQUIRED freetype2)
         pkg_check_modules(FONTCONFIG REQUIRED fontconfig)

[prev in list] [next in list] [prev in thread] [next in thread]