diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:05:18 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-24 03:05:18 +0200 |
commit | d00e0e3f9ac2f38535cf2eb84f54e451261c3c5c (patch) | |
tree | dfd1452473f8aa2dc6bfb3c4830843640fac87ae /src/xmlpatterns/parser/qtokenrevealer.cpp | |
parent | b4d1a4299f0f335540e7bb73f92a4b4f1b1a7def (diff) | |
parent | fb1d4a985fed617372788e9b774b2e77e33768f4 (diff) | |
download | qtxmlpatterns-d00e0e3f9ac2f38535cf2eb84f54e451261c3c5c.tar.gz |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia4166b28c3fc1d7bcdd58ce3f23212a777ee711f
Diffstat (limited to 'src/xmlpatterns/parser/qtokenrevealer.cpp')
-rw-r--r-- | src/xmlpatterns/parser/qtokenrevealer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmlpatterns/parser/qtokenrevealer.cpp b/src/xmlpatterns/parser/qtokenrevealer.cpp index 486c40d..a7d8bb1 100644 --- a/src/xmlpatterns/parser/qtokenrevealer.cpp +++ b/src/xmlpatterns/parser/qtokenrevealer.cpp @@ -60,7 +60,7 @@ void TokenRevealer::setParserContext(const ParserContext::Ptr &parseInfo) m_tokenizer->setParserContext(parseInfo); } -Tokenizer::Token TokenRevealer::nextToken(YYLTYPE *const sourceLocator) +Tokenizer::Token TokenRevealer::nextToken(XPATHLTYPE *const sourceLocator) { const Token token(m_tokenizer->nextToken(sourceLocator)); const QString asString(tokenToString(token)); |