[fontdatabase] Use the CONFIG += qpa/genericunixfontdatabase

Late follow up of fc9a648dc03ec4531553bc3d65ae4dba3c5b5980 that
tries to make plugins indifferent of where the source is located
in relation to qtbase.

Change-Id: I9a5944fe737056216c7174d8d9151c8d0e776a22
Merge-request: 64
Reviewed-on: http://codereview.qt-project.org/5933
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
index e516fb1..2ec4efa 100644 (file)
--- a/src/plugins/platforms/directfb/directfb.pro
+++ b/src/plugins/platforms/directfb/directfb.pro
@@ -32,6 +32,6 @@ HEADERS = qdirectfbintegration.h \
 
 # ### port the GL context
 
-include(../fontdatabases/genericunix/genericunix.pri)
+CONFIG += qpa/genericunixfontdatabase
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target

diff --git a/src/plugins/platforms/eglfs/eglfs.pro b/src/plugins/platforms/eglfs/eglfs.pro
index 7369832..8675dc1 100644 (file)
--- a/src/plugins/platforms/eglfs/eglfs.pro
+++ b/src/plugins/platforms/eglfs/eglfs.pro
@@ -21,7 +21,7 @@ HEADERS =   qeglfsintegration.h \
             qeglfsbackingstore.h \
             qeglfsscreen.h
 
-include(../../../platformsupport/fontdatabases/genericunix/genericunix.pri)
+CONFIG += qpa/genericunixfontdatabase
 
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target

diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro
index 9375486..1fc7a8f 100644 (file)
--- a/src/plugins/platforms/linuxfb/linuxfb.pro
+++ b/src/plugins/platforms/linuxfb/linuxfb.pro
@@ -9,7 +9,7 @@ SOURCES = main.cpp qlinuxfbintegration.cpp
 HEADERS = qlinuxfbintegration.h
 
 include(../fb_base/fb_base.pri)
-include(../fontdatabases/genericunix/genericunix.pri)
+CONFIG += qpa/genericunixfontdatabase
 
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target

diff --git a/src/plugins/platforms/openkode/openkode.pro b/src/plugins/platforms/openkode/openkode.pro
index ad17a3b..0fcf7b1 100644 (file)
--- a/src/plugins/platforms/openkode/openkode.pro
+++ b/src/plugins/platforms/openkode/openkode.pro
@@ -19,7 +19,7 @@ HEADERS =   qopenkodeintegration.h \
             qopenkodeeventloopintegration.h \
             openkodekeytranslator.h
 
-include (../fontdatabases/genericunix/genericunix.pri)
+CONFIG += qpa/genericunixfontdatabase
 
 RESOURCES = resources.qrc
 

diff --git a/src/plugins/platforms/qvfb/qvfb.pro b/src/plugins/platforms/qvfb/qvfb.pro
index a95b13e..8738b18 100644 (file)
--- a/src/plugins/platforms/qvfb/qvfb.pro
+++ b/src/plugins/platforms/qvfb/qvfb.pro
@@ -8,7 +8,7 @@ QT += core-private gui-private platformsupport-private
 SOURCES = main.cpp qvfbintegration.cpp qvfbwindowsurface.cpp
 HEADERS = qvfbintegration.h qvfbwindowsurface.h
 
-include(../fontdatabases/genericunix/genericunix.pri)
+CONFIG += qpa/genericunixfontdatabase
 
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target

diff --git a/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro
index 321cee4..637ed82 100644 (file)
--- a/src/plugins/platforms/vnc/vnc.pro
+++ b/src/plugins/platforms/vnc/vnc.pro
@@ -15,7 +15,7 @@ HEADERS += qvnccursor.h
 SOURCES += qvnccursor.cpp
 
 include(../fb_base/fb_base.pri)
-include(../fontdatabases/genericunix/genericunix.pri)
+CONFIG += qpa/genericunixfontdatabase
 
 target.path += $$[QT_INSTALL_PLUGINS]/platforms