1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate fontconfig config test to unix scope

Browse Source 
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>
This commit is contained in:
Donald Carr 2012-06-04 17:15:57 +00:00 committed by Qt by Nokia
parent d8e457323c
commit 00f88bd090
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
config.tests/x11/fontconfig/fontconfig.cpp → config.tests/unix/fontconfig/fontconfig.cpp
View File

0
config.tests/x11/fontconfig/fontconfig.pro → config.tests/unix/fontconfig/fontconfig.pro
View File

1
config.tests/unix/freetype/freetype.pro
View File

@ -1,5 +1,4 @@
SOURCES = freetype.cpp SOURCES = freetype.cpp
CONFIG += x11
CONFIG -= qt CONFIG -= qt
LIBS += -lfreetype LIBS += -lfreetype
include(freetype.pri) include(freetype.pri)

5
configure vendored
View File

@ -4535,11 +4535,14 @@ if [ "$CFG_FONTCONFIG" != "no" ]; then
QT_CFLAGS_FONTCONFIG= QT_CFLAGS_FONTCONFIG=
QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig" QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig"
fi fi
if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS $QT_CFLAGS_FONTCONFIG $QT_LIBS_FONTCONFIG; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/fontconfig "FontConfig" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS $QT_CFLAGS_FONTCONFIG $QT_LIBS_FONTCONFIG; then
QT_CONFIG="$QT_CONFIG fontconfig" QT_CONFIG="$QT_CONFIG fontconfig"
QMakeVar set QMAKE_CFLAGS_FONTCONFIG "$QT_CFLAGS_FONTCONFIG" QMakeVar set QMAKE_CFLAGS_FONTCONFIG "$QT_CFLAGS_FONTCONFIG"
QMakeVar set QMAKE_LIBS_FONTCONFIG "$QT_LIBS_FONTCONFIG" QMakeVar set QMAKE_LIBS_FONTCONFIG "$QT_LIBS_FONTCONFIG"
CFG_FONTCONFIG=yes
CFG_LIBFREETYPE=system CFG_LIBFREETYPE=system
else
CFG_FONTCONFIG=no
fi fi
fi fi