diff options
author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-11-29 12:12:05 -0800 |
---|---|---|
committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-12-04 22:32:48 +0000 |
commit | 8d5842a2d8722322130d0f4e056bcd7be269a2b3 (patch) | |
tree | c34f51c6761cb5e6126de0188c5f1b394a3d56a5 /src/plugins/platforms/minimal/qminimalintegration.h | |
parent | e6aae7df049ab034849c91d944b16f468bf21e40 (diff) |
minimal QPA: Make font DB creation more flexible
Prioritize CoreText over Fontconfig since the former is the
native one on macOS, and any other native font DB on its
respective platform. We introduce a new 'fontconfig' option
to allow using Fontconfig instead. This works similarly to
'freetype' overriding the default font engine on Windows. A
propos of which, 'freetype' now does the same on macOS.
Change-Id: Ic8168820d1d01fddc2f26e046abb65b8ab765f89
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/plugins/platforms/minimal/qminimalintegration.h')
-rw-r--r-- | src/plugins/platforms/minimal/qminimalintegration.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h index bc7b23c83c..ad1bec2112 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.h +++ b/src/plugins/platforms/minimal/qminimalintegration.h @@ -68,7 +68,8 @@ public: enum Options { // Options to be passed on command line or determined from environment DebugBackingStore = 0x1, EnableFonts = 0x2, - FreeTypeFontDatabase = 0x4 + FreeTypeFontDatabase = 0x4, + FontconfigDatabase = 0x8 }; explicit QMinimalIntegration(const QStringList ¶meters); |