diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:00:34 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-14 03:00:34 +0200 |
| commit | 6dad1c365278e2b324b37cafaef4e7985182f5b8 (patch) | |
| tree | 21ffc9fc97d09a90d00716b7e2906cb08d5736af | |
| parent | 3b8801e7034e6b69053c377e1f13129a515f7e5e (diff) | |
| parent | e4abf2c6e3de158d3a6eb3c46b5158f741136c9d (diff) | |
| download | qtxmlpatterns-6dad1c365278e2b324b37cafaef4e7985182f5b8.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I481492bb425ee36fc887da58fd4407f305e7194c
| -rw-r--r-- | src/xmlpatterns/functions/qgenerateidfn.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/xmlpatterns/functions/qgenerateidfn.cpp b/src/xmlpatterns/functions/qgenerateidfn.cpp index b4264ae..f85381e 100644 --- a/src/xmlpatterns/functions/qgenerateidfn.cpp +++ b/src/xmlpatterns/functions/qgenerateidfn.cpp @@ -47,11 +47,12 @@ using namespace QPatternist; Item GenerateIDFN::evaluateSingleton(const DynamicContext::Ptr &context) const { - const QXmlNodeModelIndex &node = m_operands.first()->evaluateSingleton(context).asNode(); - - if(node.isNull()) + const Item item = m_operands.first()->evaluateSingleton(context); + if (item.isNull()) return AtomicString::fromValue(QString()); + const QXmlNodeModelIndex &node = item.asNode(); + return AtomicString::fromValue(QLatin1Char('T') + QString::number(qptrdiff(node.model())) + QString::number(qptrdiff(node.internalPointer())) |