diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:50:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-08 10:52:26 +0200 |
| commit | 86699cbccaa044adfd36a14453de8e5c0cefc226 (patch) | |
| tree | ea5662ef8746842a765612f45a9f48f25b9c5d6a /src/3rdparty | |
| parent | 2bcfb322df727abf96022830077d4ae8b30f644d (diff) | |
| parent | 10095542d16fc9f5b2c585abf72fe00be9debff3 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/3rdparty/masm/yarr/YarrJIT.h
src/quick/items/qquickwindow.cpp
Change-Id: I551404e1558d56c0b0626346ad1c86406bff0ec7
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/runtime/MatchResult.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/masm/runtime/MatchResult.h b/src/3rdparty/masm/runtime/MatchResult.h index d87c8516b0..b7aaa6b6fc 100644 --- a/src/3rdparty/masm/runtime/MatchResult.h +++ b/src/3rdparty/masm/runtime/MatchResult.h @@ -35,6 +35,7 @@ struct MatchResult { { } +#if !CPU(X86_64) && !CPU(ARM64) explicit ALWAYS_INLINE MatchResult(EncodedMatchResult encoded) { union u { @@ -48,6 +49,7 @@ struct MatchResult { start = value.split.start; end = value.split.end; } +#endif ALWAYS_INLINE static MatchResult failed() { |