diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2019-05-16 14:31:54 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-05-20 20:42:10 +0200 |
| commit | 248b6756da0d31c58672c0e356c3ec16e9088234 (patch) | |
| tree | 4869c1ca3d1415a9b259f4afbc61a702fee6812b /src/corelib/tools | |
| parent | cf909f0ef609c4581ebbe2f81c7ae0c5e43d653f (diff) | |
Rename util/locale_database/ to include the e that was missing
It was misnamed local_database, quite missing the point of its name.
Change-Id: I73a4fdf24f53daac12304de1f443636d89afacb2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlocale_data_p.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qlocale_mac.mm | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qt_attribution.json | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qtimezoneprivate_data_p.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h index cc9f99ae20..3e4fd4b8aa 100644 --- a/src/corelib/tools/qlocale_data_p.h +++ b/src/corelib/tools/qlocale_data_p.h @@ -84,7 +84,7 @@ static const int ImperialMeasurementSystemsCount = Do not edit this section: instead regenerate it using cldr2qlocalexml.py and qlocalexml2cpp.py on updated (or - edited) CLDR data; see qtbase/util/local_database/. + edited) CLDR data; see qtbase/util/locale_database/. */ static const QLocaleId likely_subtags[] = { diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm index a092e377b5..6c721480f3 100644 --- a/src/corelib/tools/qlocale_mac.mm +++ b/src/corelib/tools/qlocale_mac.mm @@ -145,7 +145,7 @@ static QString macTimeToString(const QTime &time, bool short_format) // Mac uses the Unicode CLDR format codes // http://www.unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table -// See also qtbase/util/local_database/dateconverter.py +// See also qtbase/util/locale_database/dateconverter.py // Makes the assumption that input formats are always well formed and consecutive letters // never exceed the maximum for the format code. static QString macToQtFormat(QStringView sys_fmt) diff --git a/src/corelib/tools/qt_attribution.json b/src/corelib/tools/qt_attribution.json index 912da3f22c..f91742d421 100644 --- a/src/corelib/tools/qt_attribution.json +++ b/src/corelib/tools/qt_attribution.json @@ -22,7 +22,7 @@ "Name": "Unicode Common Locale Data Repository (CLDR)", "QDocModule": "qtcore", "QtUsage": "Used in Qt Core (QTimeZone, QLocale).", - "Files": "For update, see qtbase/util/local_database/cldr2qlocalexml.py", + "Files": "For update, see qtbase/util/locale_database/cldr2qlocalexml.py", "Files": "qlocale_data_p.h qtimezoneprivate_data_p.h", "Description": "The Unicode CLDR provides key building blocks for software to support the diff --git a/src/corelib/tools/qtimezoneprivate_data_p.h b/src/corelib/tools/qtimezoneprivate_data_p.h index 69b9417f19..5cedac3b49 100644 --- a/src/corelib/tools/qtimezoneprivate_data_p.h +++ b/src/corelib/tools/qtimezoneprivate_data_p.h @@ -67,7 +67,7 @@ QT_BEGIN_NAMESPACE with a QT:Spec of OffsetFromUTC These tables are automatically adapted from the CLDR supplemental/windowsZones.xml data file - using a script in qtbase/util/local_database. Please do not edit this data directly. In the + using a script in qtbase/util/locale_database. Please do not edit this data directly. In the future if ICU is made a hard dependency then the ICU resource can be used directly and this table removed */ @@ -120,7 +120,7 @@ struct QUtcData { http://www.unicode.org/cldr/ Do not edit this code: run cldr2qtimezone.py on updated (or - edited) CLDR data; see qtbase/util/local_database/. + edited) CLDR data; see qtbase/util/locale_database/. */ // Windows ID Key, Country Enum, IANA ID Index |