AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename CFG_LIBFREETYPE to CFG_FREETYPE for consistency

Browse Source 
Change-Id: Id1c240a849792e6196162662429a72ce2e293ba3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Konstantin Ritt 2013-09-08 06:20:43 +03:00 committed by The Qt Project
parent 3493b8058a
commit 1ae448acbd
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -891,7 +891,7 @@ CFG_OPENVG_ON_OPENGL=auto
CFG_EGL=auto CFG_EGL=auto
CFG_SSE=auto CFG_SSE=auto
CFG_FONTCONFIG=auto CFG_FONTCONFIG=auto
CFG_LIBFREETYPE=auto CFG_FREETYPE=auto
CFG_HARFBUZZ=no CFG_HARFBUZZ=no
CFG_SQL_AVAILABLE= CFG_SQL_AVAILABLE=
QT_ALL_BUILD_PARTS=" libs tools examples tests " QT_ALL_BUILD_PARTS=" libs tools examples tests "
@ -5213,7 +5213,7 @@ if [ "$CFG_FONTCONFIG" != "no" ]; then
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_FONTCONFIG=yes
CFG_LIBFREETYPE=system CFG_FREETYPE=system
else else
CFG_FONTCONFIG=no CFG_FONTCONFIG=no
fi fi
@ -5587,12 +5587,12 @@ fi
fi fi
# freetype support # freetype support
[ "$XPLATFORM_MINGW" = "yes" ] && [ "$CFG_LIBFREETYPE" = "auto" ] && CFG_LIBFREETYPE=no [ "$XPLATFORM_MINGW" = "yes" ] && [ "$CFG_FREETYPE" = "auto" ] && CFG_FREETYPE=no
if [ "$CFG_LIBFREETYPE" = "auto" ]; then if [ "$CFG_FREETYPE" = "auto" ]; then
if compileTest unix/freetype "FreeType"; then if compileTest unix/freetype "FreeType"; then
CFG_LIBFREETYPE=system CFG_FREETYPE=system
else else
CFG_LIBFREETYPE=yes CFG_FREETYPE=yes
fi fi
fi fi
@ -6012,10 +6012,10 @@ if [ "$CFG_GIF" = "no" ]; then
elif [ "$CFG_GIF" = "yes" ]; then elif [ "$CFG_GIF" = "yes" ]; then
QT_CONFIG="$QT_CONFIG gif" QT_CONFIG="$QT_CONFIG gif"
fi fi
if [ "$CFG_LIBFREETYPE" = "no" ]; then if [ "$CFG_FREETYPE" = "no" ]; then
QT_CONFIG="$QT_CONFIG no-freetype" QT_CONFIG="$QT_CONFIG no-freetype"
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FREETYPE" QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_FREETYPE"
elif [ "$CFG_LIBFREETYPE" = "system" ]; then elif [ "$CFG_FREETYPE" = "system" ]; then
QT_CONFIG="$QT_CONFIG system-freetype" QT_CONFIG="$QT_CONFIG system-freetype"
else else
QT_CONFIG="$QT_CONFIG freetype" QT_CONFIG="$QT_CONFIG freetype"