diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-21 01:00:08 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-21 01:00:09 +0200 |
| commit | 7a252ac46780b6145084d8d5ca0549b2de3639cc (patch) | |
| tree | e8a938a26fb610e0eaba62dcf185b2e361f01951 /src/3rdparty/pcre2/src/pcre2_pattern_info.c | |
| parent | 10b8ed816d0dff4321d5a8b0723a8090b2058678 (diff) | |
| parent | 2708c6c11d685ab25c12d558961d924c9a4533d2 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iaf28977e7ecf566b28b9406dcb005d48621169c2
Diffstat (limited to 'src/3rdparty/pcre2/src/pcre2_pattern_info.c')
| -rw-r--r-- | src/3rdparty/pcre2/src/pcre2_pattern_info.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/3rdparty/pcre2/src/pcre2_pattern_info.c b/src/3rdparty/pcre2/src/pcre2_pattern_info.c index 906e9198f5..a29f5eff67 100644 --- a/src/3rdparty/pcre2/src/pcre2_pattern_info.c +++ b/src/3rdparty/pcre2/src/pcre2_pattern_info.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2017 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -390,6 +390,7 @@ while (TRUE) #endif case OP_MARK: + case OP_COMMIT_ARG: case OP_PRUNE_ARG: case OP_SKIP_ARG: case OP_THEN_ARG: |