diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:01:35 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:01:40 +0200 |
| commit | b4d1a4299f0f335540e7bb73f92a4b4f1b1a7def (patch) | |
| tree | b9cf6e85c2ce95bfdaa9203a5b41c48b748db301 | |
| parent | 3101514787f7f3a451514b2ef3fc6e7bcfe1f0ce (diff) | |
| parent | 6b3b0be6208b376d009ba3e6b7e6ab0386a5dea4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
| -rw-r--r-- | src/xmlpatterns/parser/qquerytransformparser.cpp | 2 | ||||
| -rw-r--r-- | src/xmlpatterns/parser/querytransformparser.ypp | 6 |
2 files changed, 4 insertions, 4 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; diff --git a/src/xmlpatterns/parser/querytransformparser.ypp b/src/xmlpatterns/parser/querytransformparser.ypp index 3a26b0d2..658d4b25 100644 --- a/src/xmlpatterns/parser/querytransformparser.ypp +++ b/src/xmlpatterns/parser/querytransformparser.ypp @@ -1107,16 +1107,16 @@ static Expression::Ptr createReturnOrderBy(const OrderSpecTransfer::List &orderS * specified below. This '%require' directive was introduced in Bison 2.2. */ %require "2.3a" -%name-prefix="XPath" +%define api.prefix {XPath} /* Specifies the name of the generated parser. */ -%output="qquerytransformparser.cpp" +%output "qquerytransformparser.cpp" /* Output the .output file. */ %verbose /* Yes, we want descriptive error messages. */ -%error-verbose +%define parse.error verbose /* We'd like to be reentrant/thread-safe */ %pure-parser |