}
}
}
-#endif
+#endif // QT_NO_FONTCONFIG
#if !defined(QT_NO_DEBUG) && defined(QT_HAVE_PROC_CMDLINE) && defined(QT_HAVE_PROC_EXE)
// Find out if our parent process is gdb by looking at the 'exe' symlink under /proc,.
break;
}
}
-#endif
+#endif // QT_NO_XRENDER
char *rgba = XGetDefault(qt_x11Data->display, "Xft", FC_RGBA);
if (rgba) {
getXDefault("Xft", FC_HINTING, &qt_x11Data->fc_autohint);
getXDefault("Xft", FC_MINSPACE, &qt_x11Data->fc_autohint);
#endif
-#endif // QT_NO_XRENDER
+#endif // QT_NO_FONTCONFIG
// initialize key mapper
QKeyMapper::changeKeyboard();
// create substitution dict
static void initFontSubst()
{
+#if !defined(QT_NO_FONTCONFIG)
+ if (qt_x11Data->has_fontconfig)
+ return;
+#endif
+
QFontSubst *fontSubst = globalFontSubst();
Q_ASSERT(fontSubst != 0);
if (!fontSubst->isEmpty())
return;
-#if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG)
- if (qt_x11Data->has_fontconfig)
- return;
-#endif
for (qint16 i = 0; i < FontSubstitutesTblSize; i++) {
QStringList &list = (*fontSubst)[FontSubstitutesTbl[i].original];