Merge remote-tracking branch 'origin/5.8' into dev

Blacklist tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted() on macOS.

Conflicts:
	mkspecs/features/mac/default_post.prf
	mkspecs/features/mac/sdk.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/sdk.prf
	src/angle/src/libEGL/libEGL.pro
	src/platformsupport/fontdatabases/fontdatabases.pro
	src/platformsupport/platformsupport.pro
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	tests/auto/widgets/widgets/qmenubar/BLACKLIST
	tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp

Task-number: QTBUG-56853
Change-Id: If58785210feee3550892fc7768cce90e75a2416c

1 files changed, 37 insertions, 22 deletions

diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index f9b57acaa8..b83038dbf9 100644
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -1,27 +1,42 @@
-TARGET     = QtPlatformSupport
-QT         = core-private gui-private
+TEMPLATE = subdirs
+QT_FOR_CONFIG += gui-private
 
-CONFIG += static internal_module
-mac:LIBS_PRIVATE += -lz
+SUBDIRS = \
+    eventdispatchers \
+    devicediscovery \
+    fbconvenience \
+    themes
 
-DEFINES += QT_NO_CAST_FROM_ASCII
-PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
+qtConfig(freetype)|darwin|win32: \
+    SUBDIRS += fontdatabases
 
-include(cglconvenience/cglconvenience.pri)
-include(eglconvenience/eglconvenience.pri)
-include(eventdispatchers/eventdispatchers.pri)
-include(fbconvenience/fbconvenience.pri)
-include(fontdatabases/fontdatabases.pri)
-include(glxconvenience/glxconvenience.pri)
-include(input/input.pri)
-include(devicediscovery/devicediscovery.pri)
-include(services/services.pri)
-include(themes/themes.pri)
-include(accessibility/accessibility.pri)
-include(linuxaccessibility/linuxaccessibility.pri)
-include(clipboard/clipboard.pri)
-include(platformcompositor/platformcompositor.pri)
+qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput) {
+    SUBDIRS += input
+    input.depends += devicediscovery
+}
 
-darwin: include(graphics/graphics.pri)
+unix:!darwin: \
+    SUBDIRS += services
 
-load(qt_module)
+qtConfig(opengl): \
+    SUBDIRS += platformcompositor
+qtConfig(egl): \
+    SUBDIRS += eglconvenience
+qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2): \
+    SUBDIRS += glxconvenience
+
+qtConfig(accessibility) {
+    SUBDIRS += accessibility
+    qtConfig(accessibility-atspi-bridge) {
+        SUBDIRS += linuxaccessibility
+        linuxaccessibility.depends += accessibility
+    }
+}
+
+darwin {
+    SUBDIRS += \
+        clipboard \
+        graphics
+    macos: \
+        SUBDIRS += cglconvenience
+}