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 'qt5.13' of https://github.com/eli-schwartz/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2019-06-19 20:41:48 +05:30
commit 38540e52c9
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,12 @@ HeadlessIntegration::HeadlessIntegration(const QStringList &parameters)
mPrimaryScreen->mDepth = 32; mPrimaryScreen->mDepth = 32;
mPrimaryScreen->mFormat = QImage::Format_ARGB32_Premultiplied; mPrimaryScreen->mFormat = QImage::Format_ARGB32_Premultiplied;
#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
QWindowSystemInterface::handleScreenAdded(mPrimaryScreen);
#else
screenAdded(mPrimaryScreen); screenAdded(mPrimaryScreen);
#endif
#ifdef __APPLE__ #ifdef __APPLE__
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
m_fontDatabase.reset(new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>()); m_fontDatabase.reset(new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>());