From ea913750b8793e1e518bd0eabc338e557df5ee6c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 12 Oct 2016 11:55:52 +0200 Subject: create modularized version of qtplatformsupport module lumping together all kinds of unrelated stuff has caused problems with spurious dependencies from the beginning. as the modularization infra is now in a state which supports many small private libraries just fine, take advantage of it. Change-Id: Ic40f47ce76a308bbfd32deae281f6f064fe1ef4c Reviewed-by: Jake Petroules --- src/platformsupport/platformsupport.pro | 74 +++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 27 deletions(-) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index f9b57acaa8..5161ce3520 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -1,27 +1,47 @@ -TARGET = QtPlatformSupport -QT = core-private gui-private - -CONFIG += static internal_module -mac:LIBS_PRIVATE += -lz - -DEFINES += QT_NO_CAST_FROM_ASCII -PRECOMPILED_HEADER = ../corelib/global/qt_pch.h - -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) - -darwin: include(graphics/graphics.pri) - -load(qt_module) +TEMPLATE = subdirs +QT_FOR_CONFIG += gui-private + +SUBDIRS = \ + eventdispatchers \ + devicediscovery \ + fbconvenience \ + themes + +qtConfig(freetype)|if(darwin:!if(watchos:CONFIG(simulator, simulator|device))): \ + SUBDIRS += fontdatabases + +qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput) { + SUBDIRS += input + input.depends += devicediscovery +} + +unix:!darwin: \ + SUBDIRS += services + +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 +} + +# This aggregates all of them. +legacy.file = legacy.pro +legacy.depends = $$SUBDIRS +SUBDIRS += legacy -- cgit v1.2.3 From f9a80e06ac928bf796d013dd7fba10ba30827202 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Fri, 3 Jun 2016 16:22:21 -0700 Subject: Move Windows font DB and engines to QtFontDatabaseSupport This allows creating or extending QPA plugins to provide access to QFont and related types. It concerns both GDI and DirectWrite engines, as well as the regular and the freetype based font databases. The qt.qpa.fonts logging category has been moved together into the QWindowsFontDatabase related files to avoid depending on the qwindowscontext.h header file. Finally, QwindowsNativeImage is following pending a future refactor with similar code in qpixmap_win.cpp and the Windows XP style. Change-Id: Iddff2f3d715e3ab7695e6c2052b7596a01fd6fa8 Reviewed-by: Friedemann Kleint --- src/platformsupport/platformsupport.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index 5161ce3520..bb0b7b81a3 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -7,7 +7,7 @@ SUBDIRS = \ fbconvenience \ themes -qtConfig(freetype)|if(darwin:!if(watchos:CONFIG(simulator, simulator|device))): \ +qtConfig(freetype)|if(darwin:!if(watchos:CONFIG(simulator, simulator|device)))|win32: \ SUBDIRS += fontdatabases qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput) { -- cgit v1.2.3 From bda6c2b018d31eaa53e67d0274d0d5863ae2f11c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 29 Sep 2016 18:52:07 +0200 Subject: remove monolithic platformsupport module all users have migrated to the modular libraries. Change-Id: Ifc470583c86a4f30af5335c21f2e3e4d19d39954 Reviewed-by: Lars Knoll --- src/platformsupport/platformsupport.pro | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/platformsupport/platformsupport.pro') diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro index bb0b7b81a3..09e2922505 100644 --- a/src/platformsupport/platformsupport.pro +++ b/src/platformsupport/platformsupport.pro @@ -40,8 +40,3 @@ darwin { macos: \ SUBDIRS += cglconvenience } - -# This aggregates all of them. -legacy.file = legacy.pro -legacy.depends = $$SUBDIRS -SUBDIRS += legacy -- cgit v1.2.3