make freetype & fontconfig dependencies private again
exporting the freetype dependency caused qtwayland to break with -qt-freetype, as the helper libraries' module pri files are not installed (for good reasons) afterbb10f9a80e06a, no actual user of FontDatabaseSupport needs access to the transitive dependencies anyway (one of the headers has a fontconfig dependency, but it's not used outside the module itself), so hiding them again is just fine. this partially revertsec774500f. Task-number: QTBUG-56666 Change-Id: I9e68a7e0725a92833b856c9ffdbec61c8aa5fed2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
parent
392b338f15
commit
5152c3ca82
|
|
@ -6,4 +6,4 @@ SOURCES += \
|
|||
$$PWD/qbasicfontdatabase.cpp \
|
||||
$$PWD/qfontengine_ft.cpp
|
||||
|
||||
QMAKE_USE += freetype
|
||||
QMAKE_USE_PRIVATE += freetype
|
||||
|
|
|
|||
|
|
@ -3,4 +3,4 @@ HEADERS += $$PWD/qfontconfigdatabase_p.h \
|
|||
SOURCES += $$PWD/qfontconfigdatabase.cpp \
|
||||
$$PWD/qfontenginemultifontconfig.cpp
|
||||
|
||||
QMAKE_USE += fontconfig
|
||||
QMAKE_USE_PRIVATE += fontconfig
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ HEADERS += $$PWD/qcoretextfontdatabase_p.h $$PWD/qfontengine_coretext_p.h
|
|||
OBJECTIVE_SOURCES += $$PWD/qfontengine_coretext.mm $$PWD/qcoretextfontdatabase.mm
|
||||
|
||||
qtConfig(freetype) {
|
||||
QMAKE_USE += freetype
|
||||
QMAKE_USE_PRIVATE += freetype
|
||||
HEADERS += basic/qfontengine_ft_p.h
|
||||
SOURCES += basic/qfontengine_ft.cpp
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue