summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ritt <ritt.ks@gmail.com>2013-09-08 06:55:50 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-08 10:29:08 +0200
commit69e21f1a86c201b817611d0bb237999e809cde0f (patch)
tree5432cf33b1d5e82574507ab521cf4950c1d82840
parent1ae448acbd06b3770aaad2b083ac9f2384a764ca (diff)
Add FreeType2 "no/qt/system" configure option with description
Change-Id: I9510a492efadc0262e689de8fb2ac1750bf253ff Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rwxr-xr-xconfigure13
1 files changed, 13 insertions, 0 deletions
diff --git a/configure b/configure
index 0047ff29ba..1e7f01c3f8 100755
--- a/configure
+++ b/configure
@@ -1924,6 +1924,14 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
+ freetype)
+ [ "$VAL" = "yes" ] && VAL=qt
+ if [ "$VAL" = "qt" ] || [ "$VAL" = "no" ] || [ "$VAL" = "system" ]; then
+ CFG_FREETYPE="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
xkb)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_XKB="$VAL"
@@ -3535,6 +3543,11 @@ Third Party Libraries:
+ -system-libjpeg .... Use libjpeg from the operating system.
See http://www.ijg.org
+ -no-freetype ....... Do not compile in Freetype2 support.
+ -qt-freetype ....... Use the libfreetype bundled with Qt.
+ + -system-freetype.... Use the libfreetype provided by the system (enabled if -fontconfig is active).
+ See http://www.freetype.org
+
* -no-harfbuzz ....... Do not compile HarfBuzz-NG support.
-qt-harfbuzz ....... (experimental) Use HarfBuzz-NG bundled with Qt
to do text shaping. It can still be disabled