build fix for the case fontconfig is disabled or not found

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

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 2e179f4..f095dfa 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -522,6 +522,7 @@ set(GUI_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/text/qstatictext_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/text/qstatictext.h
     ${CMAKE_CURRENT_SOURCE_DIR}/text/qharfbuzz_p.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine_ft_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine_x11_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontdatabase_x11_p.h
     ${CMAKE_CURRENT_SOURCE_DIR}/text/qunicodetables_p.h
@@ -825,6 +826,7 @@ set(GUI_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/styles/qstyle.qrc
     ${CMAKE_CURRENT_SOURCE_DIR}/text/qfont.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine_ft.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontsubset.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontmetrics.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontdatabase.cpp
@@ -955,15 +957,6 @@ if(WITH_CUPS AND CUPS_FOUND)
 endif()
 
 if(WITH_FONTCONFIG AND FONTCONFIG_FOUND)
-    set(GUI_HEADERS
-        ${GUI_HEADERS}
-        ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine_ft_p.h
-    )
-    set(GUI_SOURCES
-        ${GUI_SOURCES}
-        ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine_ft.cpp
-    )
-
     set(EXTRA_GUI_LIBS
         ${EXTRA_GUI_LIBS}
         ${FONTCONFIG_LIBRARIES}

diff --git a/src/gui/text/qfontdatabase_x11_p.h b/src/gui/text/qfontdatabase_x11_p.h
index abf3912..a34adeb 100644 (file)
--- a/src/gui/text/qfontdatabase_x11_p.h
+++ b/src/gui/text/qfontdatabase_x11_p.h
@@ -773,6 +773,7 @@ static void initializeFontDb()
 // font loader
 // --------------------------------------------------------------------------------------
 
+#ifndef QT_NO_FONTCONFIG
 static const char *styleHint(const QFontDef &request)
 {
     const char *stylehint = 0;
@@ -794,7 +795,6 @@ static const char *styleHint(const QFontDef &request)
     return stylehint;
 }
 
-#ifndef QT_NO_FONTCONFIG
 static void qt_addPatternProps(FcPattern *pattern, int screen, QUnicodeTables::Script script, const QFontDef &request)
 {
     double size_value = qMax(qreal(1.), request.pixelSize);
@@ -1136,8 +1136,8 @@ void QFontDatabase::load(const QFontPrivate *d, int script)
 #ifndef QT_NO_FONTCONFIG
         if (qt_x11Data->has_fontconfig) {
             fe = loadFc(d, static_cast<QUnicodeTables::Script>(script), req);
-#endif
         }
+#endif
         if (!fe) {
             fe = new QFontEngineBox(req.pixelSize);
             fe->fontDef = QFontDef();