From 42391b3a9f90132abc33cfc08cac16e9472888a7 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@vdwaa.nl>
Date: Wed, 25 Jan 2017 20:49:08 +0100
Subject: [PATCH] Add conditional includes for Qt 5.8.0

---
 src/calibre/headless/fontconfig_database.cpp  | 4 ++++
 src/calibre/headless/fontconfig_database.h    | 4 ++++
 src/calibre/headless/headless_integration.cpp | 8 ++++++++
 src/calibre/headless/headless_integration.h   | 4 ++++
 4 files changed, 20 insertions(+)

diff --git a/src/calibre/headless/fontconfig_database.cpp b/src/calibre/headless/fontconfig_database.cpp
index 34620fc514..a3730733d9 100644
--- a/src/calibre/headless/fontconfig_database.cpp
+++ b/src/calibre/headless/fontconfig_database.cpp
@@ -41,7 +41,11 @@
 #include <qpa/qplatformintegration.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>
+#endif
 #include <QtGui/private/qfontengine_ft_p.h>
 #include <QtGui/private/qguiapplication_p.h>
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
diff --git a/src/calibre/headless/fontconfig_database.h b/src/calibre/headless/fontconfig_database.h
index 234510de48..d4eadbca51 100644
--- a/src/calibre/headless/fontconfig_database.h
+++ b/src/calibre/headless/fontconfig_database.h
@@ -7,7 +7,11 @@
 #pragma once
 
 #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>
+#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/calibre/headless/headless_integration.cpp b/src/calibre/headless/headless_integration.cpp
index a89917463a..6eb553bfc1 100644
--- a/src/calibre/headless/headless_integration.cpp
+++ b/src/calibre/headless/headless_integration.cpp
@@ -4,10 +4,18 @@
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 1))
 #include "fontconfig_database.h"
 #else
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+#include <QtFontDatabaseSupport/private/qfontconfigdatabase_p.h>
+#else
 #include <QtPlatformSupport/private/qfontconfigdatabase_p.h>
 #endif
+#endif
 #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>
+#endif
 #else
 #include <QtCore/private/qeventdispatcher_win_p.h>
 #endif
diff --git a/src/calibre/headless/headless_integration.h b/src/calibre/headless/headless_integration.h
index 71e9bb2760..dc37a021c6 100644
--- a/src/calibre/headless/headless_integration.h
+++ b/src/calibre/headless/headless_integration.h
@@ -3,7 +3,11 @@
 #include <qpa/qplatformintegration.h>
 #include <qpa/qplatformscreen.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>
+#endif
 #include <QScopedPointer>
 
 QT_BEGIN_NAMESPACE