Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build fix for the case fontconfig is disabled or not found

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-08-29 02:56:20 +03:00
parent 8d9083322b
commit 196dae3d7a
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gui/CMakeLists.txt
View file

@ -522,6 +522,7 @@ set(GUI_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/text/qstatictext_p.h ${CMAKE_CURRENT_SOURCE_DIR}/text/qstatictext_p.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qstatictext.h ${CMAKE_CURRENT_SOURCE_DIR}/text/qstatictext.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qharfbuzz_p.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/qfontengine_x11_p.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qfontdatabase_x11_p.h ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontdatabase_x11_p.h
${CMAKE_CURRENT_SOURCE_DIR}/text/qunicodetables_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}/styles/qstyle.qrc
${CMAKE_CURRENT_SOURCE_DIR}/text/qfont.cpp ${CMAKE_CURRENT_SOURCE_DIR}/text/qfont.cpp
${CMAKE_CURRENT_SOURCE_DIR}/text/qfontengine.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/qfontsubset.cpp
${CMAKE_CURRENT_SOURCE_DIR}/text/qfontmetrics.cpp ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontmetrics.cpp
${CMAKE_CURRENT_SOURCE_DIR}/text/qfontdatabase.cpp ${CMAKE_CURRENT_SOURCE_DIR}/text/qfontdatabase.cpp
@ -955,15 +957,6 @@ if(WITH_CUPS AND CUPS_FOUND)
endif() endif()
if(WITH_FONTCONFIG AND FONTCONFIG_FOUND) 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 set(EXTRA_GUI_LIBS
${EXTRA_GUI_LIBS} ${EXTRA_GUI_LIBS}
${FONTCONFIG_LIBRARIES} ${FONTCONFIG_LIBRARIES}

4
src/gui/text/qfontdatabase_x11_p.h
View file

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