From: Jiang Jiang <jiang.jiang@nokia.com>
Date: Fri, 27 May 2011 12:24:21 +0000 (+0200)
Subject: Fix compile for systems with old fontconfig
X-Git-Tag: qt-v5.0.0-alpha1~4231
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93339428c040a2576e4e0da315b1a6a4e4c1916f;p=profile%2Fivi%2Fqtbase.git

Fix compile for systems with old fontconfig

Change-Id: Ia26796bdbab7988d14163d3c1290111c0cb22bf7
Reviewed-on: http://codereview.qt.nokia.com/182
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---

diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp
index 8a13d91..a5fdcb5 100644
--- a/src/gui/text/qfontdatabase_x11.cpp
+++ b/src/gui/text/qfontdatabase_x11.cpp
@@ -1996,6 +1996,11 @@ void QFontDatabase::load(const QFontPrivate *d, int script)
     QFontCache::instance()->insertEngine(key, fe);
 }
 
+// Needed for fontconfig version < 2.2.97
+#ifndef FC_FAMILYLANG
+#define FC_FAMILYLANG "familylang"
+#endif
+
 static void registerFont(QFontDatabasePrivate::ApplicationFont *fnt)
 {
 #if defined(QT_NO_FONTCONFIG)