From 6852ba815de30de1c321599d0864f0786a2d2652 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 23 Oct 2019 16:37:22 +0200 Subject: Correct some references to corelib/tools/ to say corelib/text/ The Unicode data tables moved with QString and friends. So did the locale data generated from CLDR. This amends commit a9aa206b7b8ac4e69f8c46233b4080e00e845ff5. Change-Id: If12f0420b559dcb78993adc00e9f39751bca684a Reviewed-by: Volker Hilsheimer --- util/locale_database/qlocalexml2cpp.py | 2 +- util/unicode/README | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/util/locale_database/qlocalexml2cpp.py b/util/locale_database/qlocalexml2cpp.py index a5ff7ebbf4..52e6331569 100755 --- a/util/locale_database/qlocalexml2cpp.py +++ b/util/locale_database/qlocalexml2cpp.py @@ -357,7 +357,7 @@ def main(): qtsrcdir = sys.argv[2] if not (os.path.isdir(qtsrcdir) - and all(os.path.isfile(os.path.join(qtsrcdir, 'src', 'corelib', 'tools', leaf)) + and all(os.path.isfile(os.path.join(qtsrcdir, 'src', 'corelib', 'text', leaf)) for leaf in ('qlocale_data_p.h', 'qlocale.h', 'qlocale.qdoc'))): usage() diff --git a/util/unicode/README b/util/unicode/README index 87f055d42d..1f14459d14 100644 --- a/util/unicode/README +++ b/util/unicode/README @@ -1,4 +1,4 @@ -Unicode is used to generate the unicode data in src/corelib/tools. +Unicode is used to generate the unicode data in src/corelib/text/. To update: * Find the data (UAX #44, UCD; not the XML version) at @@ -21,7 +21,7 @@ To update: * Build with the modified code, fix any compilation issues. * That may have updated qtbase/src/corelib/text/qunicodetables.cpp; if so the update matters; be sure to commit the changes to data/ at - the same time and update tools/qt_attribution.json to match; use the + the same time and update text/qt_attribution.json to match; use the UCD Revision number, rather than the Unicode standard number, as the Version, for all that qunicodetables.cpp uses the latter. -- cgit v1.2.3