summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms')
-rw-r--r--src/plugins/platforms/android/android.pro2
-rw-r--r--src/plugins/platforms/bsdfb/bsdfb.pro2
-rw-r--r--src/plugins/platforms/directfb/directfb.pro3
-rw-r--r--src/plugins/platforms/eglfs/eglfsdeviceintegration.pro2
-rw-r--r--src/plugins/platforms/integrity/integrity.pro2
-rw-r--r--src/plugins/platforms/linuxfb/linuxfb.pro2
-rw-r--r--src/plugins/platforms/minimal/minimal.pro2
-rw-r--r--src/plugins/platforms/minimalegl/minimalegl.pro2
-rw-r--r--src/plugins/platforms/mirclient/mirclient.pro2
-rw-r--r--src/plugins/platforms/openwfd/openwf.pro2
-rw-r--r--src/plugins/platforms/vnc/vnc.pro2
-rw-r--r--src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri2
-rw-r--r--src/plugins/platforms/xcb/xcb_qpa_lib.pro2
13 files changed, 2 insertions, 25 deletions
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