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.8-includes' of https://github.com/jelly/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2017-01-26 08:07:02 +05:30
commit 27e92631c7
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,11 @@
#include <qpa/qplatformintegration.h> #include <qpa/qplatformintegration.h>
#include <qpa/qplatformservices.h> #include <qpa/qplatformservices.h>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
#include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
#else
#include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h> #include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
#endif
#include <QtGui/private/qfontengine_ft_p.h> #include <QtGui/private/qfontengine_ft_p.h>
#include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qguiapplication_p.h>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))

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

@ -7,7 +7,11 @@
#pragma once #pragma once
#include <qpa/qplatformfontdatabase.h> #include <qpa/qplatformfontdatabase.h>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
#else
#include <QtPlatformSupport/private/qbasicfontdatabase_p.h> #include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

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

@ -4,10 +4,18 @@
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 1)) #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 1))
#include "fontconfig_database.h" #include "fontconfig_database.h"
#else #else
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
#include <QtFontDatabaseSupport/private/qfontconfigdatabase_p.h>
#else
#include <QtPlatformSupport/private/qfontconfigdatabase_p.h> #include <QtPlatformSupport/private/qfontconfigdatabase_p.h>
#endif #endif
#endif
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#else
#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h> #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
#endif
#else #else
#include <QtCore/private/qeventdispatcher_win_p.h> #include <QtCore/private/qeventdispatcher_win_p.h>
#endif #endif

4
src/calibre/headless/headless_integration.h
View File

@ -3,7 +3,11 @@
#include <qpa/qplatformintegration.h> #include <qpa/qplatformintegration.h>
#include <qpa/qplatformscreen.h> #include <qpa/qplatformscreen.h>
#include <qpa/qplatformservices.h> #include <qpa/qplatformservices.h>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
#include <QtServiceSupport/private/qgenericunixservices_p.h>
#else
#include <QtPlatformSupport/private/qgenericunixservices_p.h> #include <QtPlatformSupport/private/qgenericunixservices_p.h>
#endif
#include <QScopedPointer> #include <QScopedPointer>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE