summaryrefslogtreecommitdiff
path: root/user/kwin/kwin-5.8-stop-depending-on-qt5-internals.patch
blob: 7b77e9c5725006eba62466d49628a921caf20e26 (plain) (blame)
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
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
From 052fa2e4ee329810f62c29e546254fb45bf8a375 Mon Sep 17 00:00:00 2001
From: Takahiro Hashimoto <kenya888@gmail.com>
Date: Thu, 27 Oct 2016 09:43:21 +0900
Subject: [PATCH] [plugins/qpa] support use of modularized qtplatformsupport
 from Qt 5.8

REVIEW: 129268
---
 CMakeLists.txt                                    |   9 +-
 cmake/modules/FindQt5EventDispatcherSupport.cmake | 122 ++++++++++++++++++++++
 cmake/modules/FindQt5FontDatabaseSupport.cmake    | 122 ++++++++++++++++++++++
 cmake/modules/FindQt5ThemeSupport.cmake           | 122 ++++++++++++++++++++++
 plugins/qpa/CMakeLists.txt                        |  15 ++-
 plugins/qpa/integration.cpp                       |   7 ++
 6 files changed, 394 insertions(+), 3 deletions(-)
 create mode 100644 cmake/modules/FindQt5EventDispatcherSupport.cmake
 create mode 100644 cmake/modules/FindQt5FontDatabaseSupport.cmake
 create mode 100644 cmake/modules/FindQt5ThemeSupport.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d2883fea..bf90ab0f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,7 +241,14 @@ set_package_properties(X11_XCB PROPERTIES
                        TYPE OPTIONAL)
 
 # dependencies for QPA plugin
-find_package(Qt5PlatformSupport REQUIRED)
+if(Qt5Core_VERSION VERSION_LESS "5.8.0")
+    find_package(Qt5PlatformSupport REQUIRED)
+else()
+    find_package(Qt5FontDatabaseSupport REQUIRED)
+    find_package(Qt5ThemeSupport REQUIRED)
+    find_package(Qt5EventDispatcherSupport REQUIRED)
+endif()
+
 find_package(Freetype REQUIRED)
 set_package_properties(Freetype PROPERTIES DESCRIPTION "A font rendering engine"
                        URL "http://www.freetype.org"
diff --git a/cmake/modules/FindQt5EventDispatcherSupport.cmake b/cmake/modules/FindQt5EventDispatcherSupport.cmake
new file mode 100644
index 000000000..948efe0d3
--- /dev/null
+++ b/cmake/modules/FindQt5EventDispatcherSupport.cmake
@@ -0,0 +1,122 @@
+#.rst:
+# FindQt5EventDispatcherSupport
+# -------
+#
+# Try to find Qt5EventDispatcherSupport on a Unix system.
+#
+# This will define the following variables:
+#
+# ``Qt5EventDispatcherSupport_FOUND``
+#     True if (the requested version of) Qt5EventDispatcherSupport is available
+# ``Qt5EventDispatcherSupport_VERSION``
+#     The version of Qt5EventDispatcherSupport
+# ``Qt5EventDispatcherSupport_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the ``Qt5EventDispatcherSupport::Qt5EventDispatcherSupport``
+#     target
+# ``Qt5EventDispatcherSupport_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the target is not
+#     used for linking
+# ``Qt5EventDispatcherSupport_DEFINITIONS``
+#     This should be passed to target_compile_options() if the target is not
+#     used for linking
+#
+# If ``Qt5EventDispatcherSupport_FOUND`` is TRUE, it will also define the following imported target:
+#
+# ``Qt5EventDispatcherSupport::Qt5EventDispatcherSupport``
+#     The Qt5EventDispatcherSupport library
+#
+# In general we recommend using the imported target, as it is easier to use.
+# Bear in mind, however, that if the target is in the link interface of an
+# exported library, it must be made available by the package config file.
+
+#=============================================================================
+# Copyright 2014 Alex Merry <alex.merry@kde.org>
+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
+# Copyright 2016 Takahiro Hashimoto <kenya888@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+    message(FATAL_ERROR "CMake 2.8.12 is required by FindQt5EventDispatcherSupport.cmake")
+endif()
+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
+    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindQt5EventDispatcherSupport.cmake")
+endif()
+
+# Use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+find_package(PkgConfig)
+pkg_check_modules(PKG_Qt5EventDispatcherSupport QUIET Qt5Gui)
+
+set(Qt5EventDispatcherSupport_DEFINITIONS ${PKG_Qt5EventDispatcherSupport_CFLAGS_OTHER})
+set(Qt5EventDispatcherSupport_VERSION ${PKG_Qt5EventDispatcherSupport_VERSION})
+
+find_path(Qt5EventDispatcherSupport_INCLUDE_DIR
+    NAMES
+        QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h
+    HINTS
+        ${PKG_Qt5EventDispatcherSupport_INCLUDEDIR}/QtEventDispatcherSupport/${PKG_Qt5EventDispatcherSupport_VERSION}/
+)
+find_library(Qt5EventDispatcherSupport_LIBRARY
+    NAMES
+        Qt5EventDispatcherSupport
+    HINTS
+        ${PKG_Qt5EventDispatcherSupport_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Qt5EventDispatcherSupport
+    FOUND_VAR
+        Qt5EventDispatcherSupport_FOUND
+    REQUIRED_VARS
+        Qt5EventDispatcherSupport_LIBRARY
+        Qt5EventDispatcherSupport_INCLUDE_DIR
+    VERSION_VAR
+        Qt5EventDispatcherSupport_VERSION
+)
+
+if(Qt5EventDispatcherSupport_FOUND AND NOT TARGET Qt5EventDispatcherSupport::Qt5EventDispatcherSupport)
+    add_library(Qt5EventDispatcherSupport::Qt5EventDispatcherSupport UNKNOWN IMPORTED)
+    set_target_properties(Qt5EventDispatcherSupport::Qt5EventDispatcherSupport PROPERTIES
+        IMPORTED_LOCATION "${Qt5EventDispatcherSupport_LIBRARY}"
+        INTERFACE_COMPILE_OPTIONS "${Qt5EventDispatcherSupport_DEFINITIONS}"
+        INTERFACE_INCLUDE_DIRECTORIES "${Qt5EventDispatcherSupport_INCLUDE_DIR}"
+    )
+endif()
+
+mark_as_advanced(Qt5EventDispatcherSupport_LIBRARY Qt5EventDispatcherSupport_INCLUDE_DIR)
+
+# compatibility variables
+set(Qt5EventDispatcherSupport_LIBRARIES ${Qt5EventDispatcherSupport_LIBRARY})
+set(Qt5EventDispatcherSupport_INCLUDE_DIRS ${Qt5EventDispatcherSupport_INCLUDE_DIR})
+set(Qt5EventDispatcherSupport_VERSION_STRING ${Qt5EventDispatcherSupport_VERSION})
+
+
+include(FeatureSummary)
+set_package_properties(Qt5EventDispatcherSupport PROPERTIES
+    URL "http://www.qt.io"
+    DESCRIPTION "Qt EventDispatcherSupport module."
+)
+
diff --git a/cmake/modules/FindQt5FontDatabaseSupport.cmake b/cmake/modules/FindQt5FontDatabaseSupport.cmake
new file mode 100644
index 000000000..d3e66cd30
--- /dev/null
+++ b/cmake/modules/FindQt5FontDatabaseSupport.cmake
@@ -0,0 +1,122 @@
+#.rst:
+# FindQt5FontDatabaseSupport
+# -------
+#
+# Try to find Qt5FontDatabaseSupport on a Unix system.
+#
+# This will define the following variables:
+#
+# ``Qt5FontDatabaseSupport_FOUND``
+#     True if (the requested version of) Qt5FontDatabaseSupport is available
+# ``Qt5FontDatabaseSupport_VERSION``
+#     The version of Qt5FontDatabaseSupport
+# ``Qt5FontDatabaseSupport_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the ``Qt5FontDatabaseSupport::Qt5FontDatabaseSupport``
+#     target
+# ``Qt5FontDatabaseSupport_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the target is not
+#     used for linking
+# ``Qt5FontDatabaseSupport_DEFINITIONS``
+#     This should be passed to target_compile_options() if the target is not
+#     used for linking
+#
+# If ``Qt5FontDatabaseSupport_FOUND`` is TRUE, it will also define the following imported target:
+#
+# ``Qt5FontDatabaseSupport::Qt5FontDatabaseSupport``
+#     The Qt5FontDatabaseSupport library
+#
+# In general we recommend using the imported target, as it is easier to use.
+# Bear in mind, however, that if the target is in the link interface of an
+# exported library, it must be made available by the package config file.
+
+#=============================================================================
+# Copyright 2014 Alex Merry <alex.merry@kde.org>
+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
+# Copyright 2016 Takahiro Hashimoto <kenya888@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+    message(FATAL_ERROR "CMake 2.8.12 is required by FindQt5FontDatabaseSupport.cmake")
+endif()
+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
+    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindQt5FontDatabaseSupport.cmake")
+endif()
+
+# Use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+find_package(PkgConfig)
+pkg_check_modules(PKG_Qt5FontDatabaseSupport QUIET Qt5Gui)
+
+set(Qt5FontDatabaseSupport_DEFINITIONS ${PKG_Qt5FontDatabaseSupport_CFLAGS_OTHER})
+set(Qt5FontDatabaseSupport_VERSION ${PKG_Qt5FontDatabaseSupport_VERSION})
+
+find_path(Qt5FontDatabaseSupport_INCLUDE_DIR
+    NAMES
+        QtFontDatabaseSupport/private/qfontconfigdatabase_p.h
+    HINTS
+        ${PKG_Qt5FontDatabaseSupport_INCLUDEDIR}/QtFontDatabaseSupport/${PKG_Qt5FontDatabaseSupport_VERSION}/
+)
+find_library(Qt5FontDatabaseSupport_LIBRARY
+    NAMES
+        Qt5FontDatabaseSupport
+    HINTS
+        ${PKG_Qt5FontDatabaseSupport_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Qt5FontDatabaseSupport
+    FOUND_VAR
+        Qt5FontDatabaseSupport_FOUND
+    REQUIRED_VARS
+        Qt5FontDatabaseSupport_LIBRARY
+        Qt5FontDatabaseSupport_INCLUDE_DIR
+    VERSION_VAR
+        Qt5FontDatabaseSupport_VERSION
+)
+
+if(Qt5FontDatabaseSupport_FOUND AND NOT TARGET Qt5FontDatabaseSupport::Qt5FontDatabaseSupport)
+    add_library(Qt5FontDatabaseSupport::Qt5FontDatabaseSupport UNKNOWN IMPORTED)
+    set_target_properties(Qt5FontDatabaseSupport::Qt5FontDatabaseSupport PROPERTIES
+        IMPORTED_LOCATION "${Qt5FontDatabaseSupport_LIBRARY}"
+        INTERFACE_COMPILE_OPTIONS "${Qt5FontDatabaseSupport_DEFINITIONS}"
+        INTERFACE_INCLUDE_DIRECTORIES "${Qt5FontDatabaseSupport_INCLUDE_DIR}"
+    )
+endif()
+
+mark_as_advanced(Qt5FontDatabaseSupport_LIBRARY Qt5FontDatabaseSupport_INCLUDE_DIR)
+
+# compatibility variables
+set(Qt5FontDatabaseSupport_LIBRARIES ${Qt5FontDatabaseSupport_LIBRARY})
+set(Qt5FontDatabaseSupport_INCLUDE_DIRS ${Qt5FontDatabaseSupport_INCLUDE_DIR})
+set(Qt5FontDatabaseSupport_VERSION_STRING ${Qt5FontDatabaseSupport_VERSION})
+
+
+include(FeatureSummary)
+set_package_properties(Qt5FontDatabaseSupport PROPERTIES
+    URL "http://www.qt.io"
+    DESCRIPTION "Qt FontDatabaseSupport module."
+)
+
diff --git a/cmake/modules/FindQt5ThemeSupport.cmake b/cmake/modules/FindQt5ThemeSupport.cmake
new file mode 100644
index 000000000..5588a7666
--- /dev/null
+++ b/cmake/modules/FindQt5ThemeSupport.cmake
@@ -0,0 +1,122 @@
+#.rst:
+# FindQt5ThemeSupport
+# -------
+#
+# Try to find Qt5ThemeSupport on a Unix system.
+#
+# This will define the following variables:
+#
+# ``Qt5ThemeSupport_FOUND``
+#     True if (the requested version of) Qt5ThemeSupport is available
+# ``Qt5ThemeSupport_VERSION``
+#     The version of Qt5ThemeSupport
+# ``Qt5ThemeSupport_LIBRARIES``
+#     This can be passed to target_link_libraries() instead of the ``Qt5ThemeSupport::Qt5ThemeSupport``
+#     target
+# ``Qt5ThemeSupport_INCLUDE_DIRS``
+#     This should be passed to target_include_directories() if the target is not
+#     used for linking
+# ``Qt5ThemeSupport_DEFINITIONS``
+#     This should be passed to target_compile_options() if the target is not
+#     used for linking
+#
+# If ``Qt5ThemeSupport_FOUND`` is TRUE, it will also define the following imported target:
+#
+# ``Qt5ThemeSupport::Qt5ThemeSupport``
+#     The Qt5ThemeSupport library
+#
+# In general we recommend using the imported target, as it is easier to use.
+# Bear in mind, however, that if the target is in the link interface of an
+# exported library, it must be made available by the package config file.
+
+#=============================================================================
+# Copyright 2014 Alex Merry <alex.merry@kde.org>
+# Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
+# Copyright 2016 Takahiro Hashimoto <kenya888@gmail.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#=============================================================================
+
+if(CMAKE_VERSION VERSION_LESS 2.8.12)
+    message(FATAL_ERROR "CMake 2.8.12 is required by FindQt5ThemeSupport.cmake")
+endif()
+if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.12)
+    message(AUTHOR_WARNING "Your project should require at least CMake 2.8.12 to use FindQt5ThemeSupport.cmake")
+endif()
+
+# Use pkg-config to get the directories and then use these values
+# in the FIND_PATH() and FIND_LIBRARY() calls
+find_package(PkgConfig)
+pkg_check_modules(PKG_Qt5ThemeSupport QUIET Qt5Gui)
+
+set(Qt5ThemeSupport_DEFINITIONS ${PKG_Qt5ThemeSupport_CFLAGS_OTHER})
+set(Qt5ThemeSupport_VERSION ${PKG_Qt5ThemeSupport_VERSION})
+
+find_path(Qt5ThemeSupport_INCLUDE_DIR
+    NAMES
+        QtThemeSupport/private/qgenericunixthemes_p.h
+    HINTS
+        ${PKG_Qt5ThemeSupport_INCLUDEDIR}/QtThemeSupport/${PKG_Qt5ThemeSupport_VERSION}/
+)
+find_library(Qt5ThemeSupport_LIBRARY
+    NAMES
+        Qt5ThemeSupport
+    HINTS
+        ${PKG_Qt5ThemeSupport_LIBRARY_DIRS}
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Qt5ThemeSupport
+    FOUND_VAR
+        Qt5ThemeSupport_FOUND
+    REQUIRED_VARS
+        Qt5ThemeSupport_LIBRARY
+        Qt5ThemeSupport_INCLUDE_DIR
+    VERSION_VAR
+        Qt5ThemeSupport_VERSION
+)
+
+if(Qt5ThemeSupport_FOUND AND NOT TARGET Qt5ThemeSupport::Qt5ThemeSupport)
+    add_library(Qt5ThemeSupport::Qt5ThemeSupport UNKNOWN IMPORTED)
+    set_target_properties(Qt5ThemeSupport::Qt5ThemeSupport PROPERTIES
+        IMPORTED_LOCATION "${Qt5ThemeSupport_LIBRARY}"
+        INTERFACE_COMPILE_OPTIONS "${Qt5ThemeSupport_DEFINITIONS}"
+        INTERFACE_INCLUDE_DIRECTORIES "${Qt5ThemeSupport_INCLUDE_DIR}"
+    )
+endif()
+
+mark_as_advanced(Qt5ThemeSupport_LIBRARY Qt5ThemeSupport_INCLUDE_DIR)
+
+# compatibility variables
+set(Qt5ThemeSupport_LIBRARIES ${Qt5ThemeSupport_LIBRARY})
+set(Qt5ThemeSupport_INCLUDE_DIRS ${Qt5ThemeSupport_INCLUDE_DIR})
+set(Qt5ThemeSupport_VERSION_STRING ${Qt5ThemeSupport_VERSION})
+
+
+include(FeatureSummary)
+set_package_properties(Qt5ThemeSupport PROPERTIES
+    URL "http://www.qt.io"
+    DESCRIPTION "Qt ThemeSupport module."
+)
+
diff --git a/plugins/qpa/CMakeLists.txt b/plugins/qpa/CMakeLists.txt
index 1a91a0ff1..4094ae7d2 100644
--- a/plugins/qpa/CMakeLists.txt
+++ b/plugins/qpa/CMakeLists.txt
@@ -1,6 +1,5 @@
 include_directories(${Qt5Core_PRIVATE_INCLUDE_DIRS})
 include_directories(${Qt5Gui_PRIVATE_INCLUDE_DIRS})
-add_definitions(-DQ_FONTCONFIGDATABASE)
 
 set(QPA_SOURCES
     abstractplatformcontext.cpp
@@ -19,10 +18,22 @@ include(ECMQtDeclareLoggingCategory)
 ecm_qt_declare_logging_category(QPA_SOURCES HEADER logging.h IDENTIFIER KWIN_QPA CATEGORY_NAME kwin_qpa_plugin DEFAULT_SEVERITY Critical)
 
 add_library(KWinQpaPlugin MODULE ${QPA_SOURCES})
+
+if(Qt5Core_VERSION VERSION_LESS "5.8.0")
+    add_definitions(-DQ_FONTCONFIGDATABASE)
+    set(QT5PLATFORMSUPPORT_LIBS Qt5PlatformSupport::Qt5PlatformSupport)
+else()
+    set(QT5PLATFORMSUPPORT_LIBS
+        Qt5FontDatabaseSupport::Qt5FontDatabaseSupport
+        Qt5ThemeSupport::Qt5ThemeSupport
+        Qt5EventDispatcherSupport::Qt5EventDispatcherSupport
+)
+endif()
+
 target_link_libraries(KWinQpaPlugin
     kwin
     KF5::WaylandClient
-    Qt5PlatformSupport::Qt5PlatformSupport
+    ${QT5PLATFORMSUPPORT_LIBS}
     ${FONTCONFIG_LIBRARIES}
     ${FREETYPE_LIBRARIES}
 )
diff --git a/plugins/qpa/integration.cpp b/plugins/qpa/integration.cpp
index 8913bf0a1..fcca48f79 100644
--- a/plugins/qpa/integration.cpp
+++ b/plugins/qpa/integration.cpp
@@ -46,9 +46,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <qpa/qplatforminputcontextfactory_p.h>
 #include <qpa/qwindowsysteminterface.h>
 #include <QtCore/private/qeventdispatcher_unix_p.h>
+
+#if QT_VERSION >= 0x050800
+#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
+#include <QtThemeSupport/private/qgenericunixthemes_p.h>
+#include <QtEventDispatcherSupport/private/qunixeventdispatcher_qpa_p.h>
+#else
 #include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
 #include <QtPlatformSupport/private/qgenericunixthemes_p.h>
 #include <QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h>
+#endif
 
 namespace KWin
 {