Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Fix loading of CoreText font database on newer Qt in the headless plugin

Browse Source
This commit is contained in:
Kovid Goyal 2019-06-08 10:31:03 +05:30
parent d39087a356
commit 4abffead71
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/headless/headless_integration.cpp
View File

@ -4,6 +4,7 @@
#ifdef __APPLE__ #ifdef __APPLE__
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
#include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h> #include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
class QCoreTextFontEngine;
#else #else
#include <QtPlatformSupport/private/qcoretextfontdatabase_p.h> #include <QtPlatformSupport/private/qcoretextfontdatabase_p.h>
#endif #endif
@ -37,6 +38,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef __APPLE__ #ifndef __APPLE__
class GenericUnixServices : public QGenericUnixServices { class GenericUnixServices : public QGenericUnixServices {
/* We must return desktop environment as UNKNOWN otherwise other parts of /* We must return desktop environment as UNKNOWN otherwise other parts of
@ -64,7 +66,11 @@ HeadlessIntegration::HeadlessIntegration(const QStringList &parameters)
screenAdded(mPrimaryScreen); screenAdded(mPrimaryScreen);
#ifdef __APPLE__ #ifdef __APPLE__
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
m_fontDatabase.reset(new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>());
#else
m_fontDatabase.reset(new QCoreTextFontDatabase()); m_fontDatabase.reset(new QCoreTextFontDatabase());
#endif
#else #else
m_fontDatabase.reset(new QFontconfigDatabase()); m_fontDatabase.reset(new QFontconfigDatabase());
#endif #endif