diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-10-03 16:46:08 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-03 17:25:57 +0200 |
| commit | 68da9153731a931a395d30255823b180e1730275 (patch) | |
| tree | 4037766c0617f535e12ac58fb467eb7a208c6fe4 /src | |
| parent | 5aaedccc437192206624102e3020cb86cf51afc7 (diff) | |
[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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/directfb/directfb.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/eglfs.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/linuxfb/linuxfb.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/openkode/openkode.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/qvfb/qvfb.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/vnc/vnc.pro | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro index e516fb11f3..2ec4efabc8 100644 --- 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 73698322dd..8675dc164e 100644 --- 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 9375486d8b..1fc7a8f898 100644 --- 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 ad17a3bc78..0fcf7b1488 100644 --- 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 a95b13efc7..8738b18bc6 100644 --- 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 321cee4790..637ed82385 100644 --- 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 |