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

Merge branch 'qt-5.9.0' of https://github.com/keszybz/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2017-05-17 05:21:57 +05:30
commit 5dbe8b1f98
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/headless/fontconfig_database.cpp
View File

@ -48,14 +48,18 @@
#include <qpa/qplatformservices.h>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
#include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
# include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
#else
#include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
# include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
#endif
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
# include <QtFontDatabaseSupport/private/qfontengine_ft_p.h>
#else
# include <QtGui/private/qfontengine_ft_p.h>
#endif
#include <QtGui/private/qfontengine_ft_p.h>
#include <QtGui/private/qguiapplication_p.h>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
#include <QtGui/private/qhighdpiscaling_p.h>
# include <QtGui/private/qhighdpiscaling_p.h>
#endif
#include <QtGui/qguiapplication.h>
@ -763,7 +767,7 @@ QFontEngine *QFontconfigDatabase::fontEngine(const QFontDef &f, void *usrPtr)
QFontEngine *QFontconfigDatabase::fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference)
{
QFontEngineFT *engine = static_cast<QFontEngineFT*>(QBasicFontDatabase::fontEngine(fontData, pixelSize, hintingPreference));
QFontEngineFT *engine = static_cast<QFontEngineFT*>(QFreeTypeFontDatabase::fontEngine(fontData, pixelSize, hintingPreference));
if (engine == 0)
return 0;
@ -915,7 +919,7 @@ QStringList QFontconfigDatabase::addApplicationFont(const QByteArray &fontData,
QString QFontconfigDatabase::resolveFontFamilyAlias(const QString &family) const
{
QString resolved = QBasicFontDatabase::resolveFontFamilyAlias(family);
QString resolved = QFreeTypeFontDatabase::resolveFontFamilyAlias(family);
if (!resolved.isEmpty() && resolved != family)
return resolved;
FcPattern *pattern = FcPatternCreate();

12
src/calibre/headless/fontconfig_database.h
View File

@ -7,17 +7,21 @@
#pragma once
#include <qpa/qplatformfontdatabase.h>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
# include <QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h>
#elif (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
# include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
# define QFreeTypeFontDatabase QBasicFontDatabase
#else
#include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
# include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
# define QFreeTypeFontDatabase QBasicFontDatabase
#endif
QT_BEGIN_NAMESPACE
class QFontEngineFT;
class QFontconfigDatabase : public QBasicFontDatabase
class QFontconfigDatabase : public QFreeTypeFontDatabase
{
public:
#if (QT_VERSION >= QT_VERSION_CHECK(5, 5, 0))