diff options
author | Donald Carr <donald.carr@nokia.com> | 2012-06-04 17:15:57 +0000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-05 06:14:06 +0200 |
commit | 00f88bd0902c852c334903d7437cb0f6e399471d (patch) | |
tree | da5e1f2283e18d8353f0229156aaba6fb0a767fc /config.tests | |
parent | d8e457323c2d2ef72ab81838ba82300672e4e26e (diff) |
Migrate fontconfig config test to unix scope
Fontconfig has no X11 dependency and is of broader use to us than the X11
context. The test should also disambiguate whether fontconfig support is
successfully detected or not.
This change also removes a false X11 dependency from the freetype test.
Change-Id: I68a596aa06f614a64163772fe29a09edba119a81
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'config.tests')
-rw-r--r-- | config.tests/unix/fontconfig/fontconfig.cpp (renamed from config.tests/x11/fontconfig/fontconfig.cpp) | 0 | ||||
-rw-r--r-- | config.tests/unix/fontconfig/fontconfig.pro (renamed from config.tests/x11/fontconfig/fontconfig.pro) | 0 | ||||
-rw-r--r-- | config.tests/unix/freetype/freetype.pro | 1 |
3 files changed, 0 insertions, 1 deletions
diff --git a/config.tests/x11/fontconfig/fontconfig.cpp b/config.tests/unix/fontconfig/fontconfig.cpp index 7f56146e12..7f56146e12 100644 --- a/config.tests/x11/fontconfig/fontconfig.cpp +++ b/config.tests/unix/fontconfig/fontconfig.cpp diff --git a/config.tests/x11/fontconfig/fontconfig.pro b/config.tests/unix/fontconfig/fontconfig.pro index 8360774035..8360774035 100644 --- a/config.tests/x11/fontconfig/fontconfig.pro +++ b/config.tests/unix/fontconfig/fontconfig.pro diff --git a/config.tests/unix/freetype/freetype.pro b/config.tests/unix/freetype/freetype.pro index e84158e25a..c0cc02d564 100644 --- a/config.tests/unix/freetype/freetype.pro +++ b/config.tests/unix/freetype/freetype.pro @@ -1,5 +1,4 @@ SOURCES = freetype.cpp -CONFIG += x11 CONFIG -= qt LIBS += -lfreetype include(freetype.pri) |