summaryrefslogtreecommitdiffstats
path: root/src/kernel/qfontdatabase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/qfontdatabase.cpp')
-rw-r--r--src/kernel/qfontdatabase.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp
index 152b6f250..83702d308 100644
--- a/src/kernel/qfontdatabase.cpp
+++ b/src/kernel/qfontdatabase.cpp
@@ -998,7 +998,6 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
request.weight, request.italic, request.stretch, request.pixelSize, pitch );
bool usesFontConfig = FALSE;
-#ifdef QT_XFT2
if (family_name.isEmpty()
|| family_name == "Sans Serif"
|| family_name == "Serif"
@@ -1007,7 +1006,6 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
usesFontConfig = (fe != 0);
}
if (!fe)
-#endif
{
TQtFontFamily *best_family = 0;
TQtFontFoundry *best_foundry = 0;
@@ -1067,11 +1065,9 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
} else if (try_family->scripts[TQFont::UnknownScript] & TQtFontFamily::Supported) {
// try with the unknown script (for a symbol font)
override_script = TQFont::UnknownScript;
-#ifndef QT_XFT2
} else if (try_family->scripts[TQFont::Unicode] & TQtFontFamily::Supported) {
// try with the unicode script instead
override_script = TQFont::Unicode;
-#endif
} else {
// family not supported by unicode/unknown scripts
continue;