diff options
author | Jiang Jiang <jiang.jiang@nokia.com> | 2011-05-27 12:24:21 (GMT) |
---|---|---|
committer | Jiang Jiang <jiang.jiang@nokia.com> | 2011-05-27 13:45:54 (GMT) |
commit | 35421a9313a324ff63df6ba27e03b8090c964717 (patch) | |
tree | 032e5977dc9186b71c7e733e2572155258d8cb68 /src/gui | |
parent | 31110bf84bb06d57983501fa65fe0db3f7c61927 (diff) | |
download | Qt-35421a9313a324ff63df6ba27e03b8090c964717.zip Qt-35421a9313a324ff63df6ba27e03b8090c964717.tar.gz Qt-35421a9313a324ff63df6ba27e03b8090c964717.tar.bz2 |
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>
(cherry picked from commit 93339428c040a2576e4e0da315b1a6a4e4c1916f)
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/text/qfontdatabase_x11.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp index 0c0c4c8..cb63844 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) |