diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-12-27 01:00:05 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-12-27 09:29:30 +0100 |
| commit | 4054c0d6ed8bafe7ca68d981daf1be51a55fe6f1 (patch) | |
| tree | b4e000e7db3ef633983fab4dc1957721fd904657 /src/3rdparty/pcre2/src/pcre2_ucp.h | |
| parent | 3ea7caed6f949953706aaa6ce00d79aa8ca15a60 (diff) | |
| parent | 25101f0984e86aa30f34773eb5b2025f58086b71 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
src/plugins/platforms/xcb/qxcbscreen.cpp
src/widgets/accessible/qaccessiblewidget.cpp
Change-Id: Ib3138e61ba7981610940509a7ff02ba2dd281bf0
Diffstat (limited to 'src/3rdparty/pcre2/src/pcre2_ucp.h')
| -rw-r--r-- | src/3rdparty/pcre2/src/pcre2_ucp.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/3rdparty/pcre2/src/pcre2_ucp.h b/src/3rdparty/pcre2/src/pcre2_ucp.h index 483abd18fc..84b22fb064 100644 --- a/src/3rdparty/pcre2/src/pcre2_ucp.h +++ b/src/3rdparty/pcre2/src/pcre2_ucp.h @@ -281,7 +281,12 @@ enum { ucp_Makasar, ucp_Medefaidrin, ucp_Old_Sogdian, - ucp_Sogdian + ucp_Sogdian, + /* New for Unicode 12.0.0 */ + ucp_Elymaic, + ucp_Nandinagari, + ucp_Nyiakeng_Puachue_Hmong, + ucp_Wancho }; #endif /* PCRE2_UCP_H_IDEMPOTENT_GUARD */ |