summaryrefslogtreecommitdiffstats
path: root/src/kernel/tqfontdatabase.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/tqfontdatabase.cpp')
-rw-r--r--src/kernel/tqfontdatabase.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/kernel/tqfontdatabase.cpp b/src/kernel/tqfontdatabase.cpp
index 5413f2db4..bda119a03 100644
--- a/src/kernel/tqfontdatabase.cpp
+++ b/src/kernel/tqfontdatabase.cpp
@@ -996,7 +996,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"
@@ -1005,7 +1004,6 @@ TQFontDatabase::findFont( TQFont::Script script, const TQFontPrivate *fp,
usesFontConfig = (fe != 0);
}
if (!fe)
-#endif
{
TQtFontFamily *best_family = 0;
TQtFontFoundry *best_foundry = 0;
@@ -1065,11 +1063,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;