diff options
| -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 | ||||
| -rwxr-xr-x | configure | 5 |
4 files changed, 4 insertions, 2 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) @@ -4535,11 +4535,14 @@ if [ "$CFG_FONTCONFIG" != "no" ]; then QT_CFLAGS_FONTCONFIG= QT_LIBS_FONTCONFIG="-lfreetype -lfontconfig" 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" QMakeVar set QMAKE_CFLAGS_FONTCONFIG "$QT_CFLAGS_FONTCONFIG" QMakeVar set QMAKE_LIBS_FONTCONFIG "$QT_LIBS_FONTCONFIG" + CFG_FONTCONFIG=yes CFG_LIBFREETYPE=system + else + CFG_FONTCONFIG=no fi fi |