mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'qt5.13' of https://github.com/eli-schwartz/calibre
This commit is contained in:
commit
38540e52c9
@ -64,7 +64,12 @@ HeadlessIntegration::HeadlessIntegration(const QStringList ¶meters)
|
||||
mPrimaryScreen->mDepth = 32;
|
||||
mPrimaryScreen->mFormat = QImage::Format_ARGB32_Premultiplied;
|
||||
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 13, 0))
|
||||
QWindowSystemInterface::handleScreenAdded(mPrimaryScreen);
|
||||
#else
|
||||
screenAdded(mPrimaryScreen);
|
||||
#endif
|
||||
|
||||
#ifdef __APPLE__
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
|
||||
m_fontDatabase.reset(new QCoreTextFontDatabaseEngineFactory<QCoreTextFontEngine>());
|
||||
|
Loading…
x
Reference in New Issue
Block a user