fb2f42b604
Quite a big change since it has been several years since the last update. This drops the Harfbuzz source on top of the existing code in Qt, and does the following additional changes: 1. Deletes old source files that have been removed upstream (everything named foo-private.hh is now renamed to just foo.hh for instance). 2. Added a header guard to config.h because it may be double-included. 3. Implement a memory barrier needed by hb-atomic.hh. 4. Changed the signature of hb_atomic_int_impl_add() to take a pointer to match new upstream. 5. Updated .pro file to include new files and removed old. 6. Updated qt_attribution.json 7. No longer disable deprecated APIs since hb_ot_tags_from_script() is now deprecated and is used from Qt code. 8. Updated and applied the patch in patches/ for CoreText. 9. Updated tst_qtextscriptengine::thaiWithZWJ() according to changes in Harfbuzz and disabled it for system-harfbuzz, since this may be an older version of harfbuzz depending on the system. Fixes: QTBUG-79606 Change-Id: I3f057a43ff44ee416628b75ef12fb1a221f31910 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
42 lines
1.2 KiB
CMake
42 lines
1.2 KiB
CMake
# Generated from text.pro.
|
|
|
|
add_subdirectory(qabstracttextdocumentlayout)
|
|
add_subdirectory(qfont)
|
|
add_subdirectory(qfontdatabase)
|
|
add_subdirectory(qfontmetrics)
|
|
add_subdirectory(qglyphrun)
|
|
add_subdirectory(qrawfont)
|
|
add_subdirectory(qstatictext)
|
|
add_subdirectory(qsyntaxhighlighter)
|
|
add_subdirectory(qtextblock)
|
|
add_subdirectory(qtextcursor)
|
|
add_subdirectory(qtextdocumentfragment)
|
|
add_subdirectory(qtextdocumentlayout)
|
|
add_subdirectory(qtextformat)
|
|
add_subdirectory(qtextlist)
|
|
add_subdirectory(qtextobject)
|
|
# add_subdirectory(qtextscriptengine) # disable until system_harfbuzz feature is available
|
|
add_subdirectory(qtexttable)
|
|
add_subdirectory(qinputcontrol)
|
|
if(QT_FEATURE_private_tests AND TARGET Qt::Xml)
|
|
add_subdirectory(qcssparser)
|
|
endif()
|
|
if(QT_FEATURE_private_tests)
|
|
add_subdirectory(qfontcache)
|
|
add_subdirectory(qtextlayout)
|
|
add_subdirectory(qzip)
|
|
add_subdirectory(qtextodfwriter)
|
|
endif()
|
|
if(TARGET Qt::Xml)
|
|
add_subdirectory(qtextdocument)
|
|
endif()
|
|
if(QT_FEATURE_private_tests AND UNIX)
|
|
add_subdirectory(qtextpiecetable)
|
|
endif()
|
|
if(QT_FEATURE_textmarkdownreader)
|
|
add_subdirectory(qtextmarkdownimporter)
|
|
endif()
|
|
if(QT_FEATURE_private_tests AND QT_FEATURE_textmarkdownwriter)
|
|
add_subdirectory(qtextmarkdownwriter)
|
|
endif()
|