rely on transitive library dependencies for freetype/fontconfig

so far, we have been delaying the linking, because we didn't want to
make the monolithic platformsupport module pull in spurious
dependencies. however, now that the module was split, there is no need
to play such games any more.

a nice effect of this is that the hideous qpa/*unixfontdatabase.prf
files disappear, and finally freetype_dependency.pri also becomes
trivial and is thus inlined.

Change-Id: I255376d592625542310a31222eb6ac965943df99
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

20 files changed, 5 insertions, 42 deletions

diff --git a/mkspecs/features/qpa/basicunixfontdatabase.prf b/mkspecs/features/qpa/basicunixfontdatabase.prf
deleted file mode 100644
index 327cd927d8..0000000000
--- a/mkspecs/features/qpa/basicunixfontdatabase.prf
+++ /dev/null
@@ -1,3 +0,0 @@
-qtConfig(system-freetype) {
-    QMAKE_USE += freetype/linkonly
-}
diff --git a/mkspecs/features/qpa/genericunixfontdatabase.prf b/mkspecs/features/qpa/genericunixfontdatabase.prf
deleted file mode 100644
index f5e54618aa..0000000000
--- a/mkspecs/features/qpa/genericunixfontdatabase.prf
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG += qpa/basicunixfontdatabase
-qtConfig(fontconfig) {
-    QMAKE_USE += fontconfig/linkonly
-}
-
diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri
deleted file mode 100644
index c477e6fdea..0000000000
--- a/src/3rdparty/freetype_dependency.pri
+++ /dev/null
@@ -1,5 +0,0 @@
-qtConfig(system-freetype) {
-    QMAKE_USE += freetype/nolink
-} else: qtConfig(freetype) {
-    QMAKE_USE += freetype
-}
diff --git a/src/platformsupport/fontdatabases/basic/basic.pri b/src/platformsupport/fontdatabases/basic/basic.pri
index 575c93fe20..c50dba3ce2 100644
--- a/src/platformsupport/fontdatabases/basic/basic.pri
+++ b/src/platformsupport/fontdatabases/basic/basic.pri
@@ -6,4 +6,4 @@ SOURCES += \
         $$PWD/qbasicfontdatabase.cpp \
         $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp
 
-include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri)
+QMAKE_USE += freetype
diff --git a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri
index 911f0c884d..6458464870 100644
--- a/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri
+++ b/src/platformsupport/fontdatabases/fontconfig/fontconfig.pri
@@ -3,4 +3,4 @@ HEADERS += $$PWD/qfontconfigdatabase_p.h \
 SOURCES += $$PWD/qfontconfigdatabase.cpp \
            $$PWD/qfontenginemultifontconfig.cpp
 
-QMAKE_USE += fontconfig/nolink
+QMAKE_USE += fontconfig
diff --git a/src/platformsupport/fontdatabases/fontdatabases.pro b/src/platformsupport/fontdatabases/fontdatabases.pro
index fdfe3f59ea..7ffeda6fe2 100644
--- a/src/platformsupport/fontdatabases/fontdatabases.pro
+++ b/src/platformsupport/fontdatabases/fontdatabases.pro
@@ -15,7 +15,6 @@ darwin:!if(watchos:CONFIG(simulator, simulator|device)) {
     }
 
     unix {
-        CONFIG += qpa/genericunixfontdatabase
         include($$PWD/genericunix/genericunix.pri)
         qtConfig(fontconfig) {
             include($$PWD/fontconfig/fontconfig.pri)
diff --git a/src/platformsupport/fontdatabases/mac/coretext.pri b/src/platformsupport/fontdatabases/mac/coretext.pri
index 4d19a59226..1caeb2c1ac 100644
--- a/src/platformsupport/fontdatabases/mac/coretext.pri
+++ b/src/platformsupport/fontdatabases/mac/coretext.pri
@@ -2,7 +2,7 @@ HEADERS += $$PWD/qcoretextfontdatabase_p.h $$PWD/qfontengine_coretext_p.h
 OBJECTIVE_SOURCES += $$PWD/qfontengine_coretext.mm $$PWD/qcoretextfontdatabase.mm
 
 qtConfig(freetype) {
-    include($$QT_SOURCE_TREE/src/3rdparty/freetype_dependency.pri)
+    QMAKE_USE += freetype
     HEADERS += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft_p.h
     SOURCES += $$QT_SOURCE_TREE/src/gui/text/qfontengine_ft.cpp
 }
diff --git a/src/plugins/platforms/android/android.pro b/src/plugins/platforms/android/android.pro
index 5912edc847..bd3fe5a6cc 100644
--- a/src/plugins/platforms/android/android.pro
+++ b/src/plugins/platforms/android/android.pro
@@ -11,8 +11,6 @@ QT += \
     eventdispatcher_support-private accessibility_support-private \
     fontdatabase_support-private egl_support-private
 
-CONFIG += qpa/genericunixfontdatabase
-
 OTHER_FILES += $$PWD/android.json
 
 INCLUDEPATH += \
diff --git a/src/plugins/platforms/bsdfb/bsdfb.pro b/src/plugins/platforms/bsdfb/bsdfb.pro
index 294edcd35d..770145a8ff 100644
--- a/src/plugins/platforms/bsdfb/bsdfb.pro
+++ b/src/plugins/platforms/bsdfb/bsdfb.pro
@@ -11,8 +11,6 @@ qtHaveModule(input_support-private): \
 SOURCES = main.cpp qbsdfbintegration.cpp qbsdfbscreen.cpp
 HEADERS = qbsdfbintegration.h qbsdfbscreen.h
 
-CONFIG += qpa/genericunixfontdatabase
-
 OTHER_FILES += bsdfb.json
 
 PLUGIN_TYPE = platforms
diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
index da7634856c..406b89e3b2 100644
--- a/src/plugins/platforms/directfb/directfb.pro
+++ b/src/plugins/platforms/directfb/directfb.pro
@@ -44,9 +44,6 @@ qtConfig(directfb_egl) {
     SOURCES += qdirectfbeglhooks_stub.cpp
 }
 
-
-CONFIG += qpa/genericunixfontdatabase
-
 OTHER_FILES += directfb.json
 
 PLUGIN_TYPE = platforms
diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
index 638d12a368..35af3615bd 100644
--- a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
+++ b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
@@ -39,7 +39,7 @@ QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
     DEFINES += EGLFS_PREFERRED_PLUGIN=$$EGLFS_DEVICE_INTEGRATION
 }
 
-CONFIG += egl qpa/genericunixfontdatabase
+CONFIG += egl
 
 # Prevent gold linker from crashing.
 # This started happening when QtPlatformSupport was modularized.
diff --git a/src/plugins/platforms/integrity/integrity.pro b/src/plugins/platforms/integrity/integrity.pro
index 178fc1b882..0fb256793d 100644
--- a/src/plugins/platforms/integrity/integrity.pro
+++ b/src/plugins/platforms/integrity/integrity.pro
@@ -16,8 +16,6 @@ HEADERS = \
     qintegrityfbscreen.h \
     qintegrityhidmanager.h
 
-CONFIG += qpa/genericunixfontdatabase
-
 OTHER_FILES += integrity.json
 
 PLUGIN_TYPE = platforms
diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro
index a752f95917..e2fa31211d 100644
--- a/src/plugins/platforms/linuxfb/linuxfb.pro
+++ b/src/plugins/platforms/linuxfb/linuxfb.pro
@@ -13,8 +13,6 @@ qtHaveModule(input_support-private): \
 SOURCES = main.cpp qlinuxfbintegration.cpp qlinuxfbscreen.cpp
 HEADERS = qlinuxfbintegration.h qlinuxfbscreen.h
 
-CONFIG += qpa/genericunixfontdatabase
-
 OTHER_FILES += linuxfb.json
 
 PLUGIN_TYPE = platforms
diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro
index 0fffb24d24..8cfb68824e 100644
--- a/src/plugins/platforms/minimal/minimal.pro
+++ b/src/plugins/platforms/minimal/minimal.pro
@@ -14,8 +14,6 @@ HEADERS =   qminimalintegration.h \
 
 OTHER_FILES += minimal.json
 
-CONFIG += qpa/genericunixfontdatabase
-
 PLUGIN_TYPE = platforms
 PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin
 !equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
diff --git a/src/plugins/platforms/minimalegl/minimalegl.pro b/src/plugins/platforms/minimalegl/minimalegl.pro
index 46334a0250..88466e7f36 100644
--- a/src/plugins/platforms/minimalegl/minimalegl.pro
+++ b/src/plugins/platforms/minimalegl/minimalegl.pro
@@ -22,7 +22,7 @@ HEADERS =   qminimaleglintegration.h \
             qminimaleglbackingstore.h \
             qminimaleglscreen.h
 
-CONFIG += egl qpa/genericunixfontdatabase
+CONFIG += egl
 
 OTHER_FILES += \
     minimalegl.json
diff --git a/src/plugins/platforms/mirclient/mirclient.pro b/src/plugins/platforms/mirclient/mirclient.pro
index 054fe74a46..623f7bf97b 100644
--- a/src/plugins/platforms/mirclient/mirclient.pro
+++ b/src/plugins/platforms/mirclient/mirclient.pro
@@ -5,8 +5,6 @@ QT += \
     theme_support-private eventdispatcher_support-private \
     fontdatabase_support-private egl_support-private
 
-CONFIG += qpa/genericunixfontdatabase
-
 DEFINES += MESA_EGL_NO_X11_HEADERS
 # CONFIG += c++11 # only enables C++0x
 QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall
diff --git a/src/plugins/platforms/openwfd/openwf.pro b/src/plugins/platforms/openwfd/openwf.pro
index 747cbf404a..6012731b65 100644
--- a/src/plugins/platforms/openwfd/openwf.pro
+++ b/src/plugins/platforms/openwfd/openwf.pro
@@ -4,8 +4,6 @@ QT += \
     core-private gui-private \
     eventdispatcher_support-private fontdatabase_support-private
 
-CONFIG += qpa/genericunixfontdatabase
-
 HEADERS += \
     qopenwfddevice.h \
     qopenwfdintegration.h \
diff --git a/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro
index 15407f9298..3cd7e9b160 100644
--- a/src/plugins/platforms/vnc/vnc.pro
+++ b/src/plugins/platforms/vnc/vnc.pro
@@ -28,6 +28,4 @@ HEADERS = \
     qvnc_p.h \
     qvncclient.h
 
-CONFIG += qpa/genericunixfontdatabase
-
 OTHER_FILES += vnc.json
diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri b/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri
index b44e4ecaa9..4ab406acb9 100644
--- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri
+++ b/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri
@@ -18,8 +18,6 @@ qtConfig(xcb-sm) {
     DEFINES += XCB_USE_SM
 }
 
-CONFIG += qpa/genericunixfontdatabase
-
 !qtConfig(system-xcb) {
     DEFINES += XCB_USE_RENDER
     QMAKE_USE += xcb-static xcb
diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
index 37556baa1d..6db0c76dea 100644
--- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro
+++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
@@ -70,8 +70,6 @@ qtConfig(xcb-sm) {
 
 include(gl_integrations/gl_integrations.pri)
 
-CONFIG += qpa/genericunixfontdatabase
-
 !qtConfig(system-xcb) {
     DEFINES += XCB_USE_RENDER
     QMAKE_USE += xcb-static xcb