summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-05 09:00:22 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-05 09:00:22 +0200
commit91a2535eed68dee924f59d2c50fc70dcd76d6d57 (patch)
tree8f4272641b5e957ea8b81fc0f38d18eb959c2c36
parentd18843086f15c0d426b004b55c452598afa25dad (diff)
parent85bec28aafc05c9b1fe3428832ee18af82747123 (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15
-rw-r--r--src/xmlpatterns/parser/qquerytransformparser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp
index ea28c693..d7d642c3 100644
--- a/src/xmlpatterns/parser/qquerytransformparser.cpp
+++ b/src/xmlpatterns/parser/qquerytransformparser.cpp
@@ -3070,7 +3070,7 @@ yytnamerr (char *yyres, const char *yystr)
case '\\':
if (*++yyp != '\\')
goto do_not_strip_quotes;
- /* Fall through. */
+ Q_FALLTHROUGH();
default:
if (yyres)
yyres[yyn] = *yyp;