do not create global static in initFontSubst() when not used

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 9f1a80d..f74e4c1 100644 (file)
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -912,7 +912,7 @@ static void getXDefault(const char *group, const char *key, bool *val)
         }
     }
 }
-#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,.
@@ -1261,7 +1261,7 @@ void qt_init(QApplicationPrivate *priv, Display *display,
                 break;
             }
         }
-#endif
+#endif // QT_NO_XRENDER
 
         char *rgba = XGetDefault(qt_x11Data->display, "Xft", FC_RGBA);
         if (rgba) {
@@ -1296,7 +1296,7 @@ void qt_init(QApplicationPrivate *priv, Display *display,
     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();

diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 32468d9..f159180 100644 (file)
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -1636,14 +1636,15 @@ static const qint16 FontSubstitutesTblSize = sizeof(FontSubstitutesTbl) / sizeof
 // 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];