diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:55:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:55:29 +0100 |
| commit | afa273865b7f2697c6e28fb1511486d2f9ce6bfe (patch) | |
| tree | 0f33dd43a368f5c9bd4399eed67763b1e9e74032 /src/xmlpatterns/parser/querytransformparser.ypp | |
| parent | fabf557bb8390a94ff4b5d8688a91ffe4abd17ec (diff) | |
| parent | 82c5cc6532ac5d0323ecda94b6767e1fdaef2639 (diff) | |
| download | qtxmlpatterns-afa273865b7f2697c6e28fb1511486d2f9ce6bfe.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1e57330ccf8e964fa41637849b4958dea64360fd
Diffstat (limited to 'src/xmlpatterns/parser/querytransformparser.ypp')
| -rw-r--r-- | src/xmlpatterns/parser/querytransformparser.ypp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/parser/querytransformparser.ypp b/src/xmlpatterns/parser/querytransformparser.ypp index c1f5302..338bfe4 100644 --- a/src/xmlpatterns/parser/querytransformparser.ypp +++ b/src/xmlpatterns/parser/querytransformparser.ypp @@ -1027,7 +1027,7 @@ static Expression::Ptr resolveVariable(const QXmlName &name, * mechanism must. */ case VariableDeclaration::ExpressionVariable: { - retval = create(new ExpressionVariableReference(var->slot, var), sourceLocator, parseInfo); + retval = create(new ExpressionVariableReference(var->slot, var.data()), sourceLocator, parseInfo); break; } case VariableDeclaration::FunctionArgument: @@ -1042,7 +1042,7 @@ static Expression::Ptr resolveVariable(const QXmlName &name, } case VariableDeclaration::TemplateParameter: { - retval = create(new TemplateParameterReference(var), sourceLocator, parseInfo); + retval = create(new TemplateParameterReference(var.data()), sourceLocator, parseInfo); break; } case VariableDeclaration::ExternalVariable: |