1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
diff -ru calibre-2.77.0.orig/setup/build.py calibre-2.77.0/setup/build.py
--- calibre-2.77.0.orig/setup/build.py 2017-01-23 21:50:37.634574707 +0100
+++ calibre-2.77.0/setup/build.py 2017-01-23 22:33:51.460014344 +0100
@@ -360,8 +360,7 @@
TARGET = headless
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = HeadlessIntegrationPlugin
- load(qt_plugin)
- QT += core-private gui-private platformsupport-private
+ QT += core-private gui-private fontdatabase_support_private service_support_private eventdispatcher_support_private
HEADERS = {headers}
SOURCES = {sources}
OTHER_FILES = {others}
diff -ru calibre-2.77.0.orig/src/calibre/headless/fontconfig_database.cpp calibre-2.77.0/src/calibre/headless/fontconfig_database.cpp
--- calibre-2.77.0.orig/src/calibre/headless/fontconfig_database.cpp 2017-01-13 04:38:35.000000000 +0100
+++ calibre-2.77.0/src/calibre/headless/fontconfig_database.cpp 2017-01-23 22:36:20.070646584 +0100
@@ -41,7 +41,7 @@
#include <qpa/qplatformintegration.h>
#include <qpa/qplatformservices.h>
-#include <QtPlatformSupport/private/qfontenginemultifontconfig_p.h>
+#include <QtFontDatabaseSupport/private/qfontenginemultifontconfig_p.h>
#include <QtGui/private/qfontengine_ft_p.h>
#include <QtGui/private/qguiapplication_p.h>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
diff -ru calibre-2.77.0.orig/src/calibre/headless/fontconfig_database.h calibre-2.77.0/src/calibre/headless/fontconfig_database.h
--- calibre-2.77.0.orig/src/calibre/headless/fontconfig_database.h 2017-01-13 04:38:35.000000000 +0100
+++ calibre-2.77.0/src/calibre/headless/fontconfig_database.h 2017-01-23 21:49:23.451289356 +0100
@@ -7,7 +7,7 @@
#pragma once
#include <qpa/qplatformfontdatabase.h>
-#include <QtPlatformSupport/private/qbasicfontdatabase_p.h>
+#include <QtFontDatabaseSupport/private/qbasicfontdatabase_p.h>
QT_BEGIN_NAMESPACE
diff -ru calibre-2.77.0.orig/src/calibre/headless/headless_integration.cpp calibre-2.77.0/src/calibre/headless/headless_integration.cpp
--- calibre-2.77.0.orig/src/calibre/headless/headless_integration.cpp 2017-01-13 04:38:35.000000000 +0100
+++ calibre-2.77.0/src/calibre/headless/headless_integration.cpp 2017-01-23 22:30:16.295767949 +0100
@@ -4,10 +4,10 @@
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 1))
#include "fontconfig_database.h"
#else
-#include <QtPlatformSupport/private/qfontconfigdatabase_p.h>
+#include <QtFontDatabaseSupport/private/qfontconfigdatabase_p.h>
#endif
#ifndef Q_OS_WIN
-#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
+#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
#else
#include <QtCore/private/qeventdispatcher_win_p.h>
#endif
diff -ru calibre-2.77.0.orig/src/calibre/headless/headless_integration.h calibre-2.77.0/src/calibre/headless/headless_integration.h
--- calibre-2.77.0.orig/src/calibre/headless/headless_integration.h 2017-01-13 04:38:35.000000000 +0100
+++ calibre-2.77.0/src/calibre/headless/headless_integration.h 2017-01-23 21:48:24.091368423 +0100
@@ -3,7 +3,7 @@
#include <qpa/qplatformintegration.h>
#include <qpa/qplatformscreen.h>
#include <qpa/qplatformservices.h>
-#include <QtPlatformSupport/private/qgenericunixservices_p.h>
+#include <QtServiceSupport/private/qgenericunixservices_p.h>
#include <QScopedPointer>
QT_BEGIN_NAMESPACE
|
