diff options
| author | axis <qt-info@nokia.com> | 2009-11-10 12:02:51 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-10 12:02:51 (GMT) |
| commit | b8e8fa9aa4684c345ec55cc41f690e78f9b4a3c0 (patch) | |
| tree | 7c79470413a171e2ad43e8fe7730e2e74770ca32 /src/xmlpatterns/functions/qpatternmatchingfns.cpp | |
| parent | 0ce94a763cfa9ec0829e096795a52446c74e4557 (diff) | |
| parent | 99f4379d397eacbdcffc40d6906175aa04d78456 (diff) | |
| download | Qt-b8e8fa9aa4684c345ec55cc41f690e78f9b4a3c0.zip Qt-b8e8fa9aa4684c345ec55cc41f690e78f9b4a3c0.tar.gz Qt-b8e8fa9aa4684c345ec55cc41f690e78f9b4a3c0.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Diffstat (limited to 'src/xmlpatterns/functions/qpatternmatchingfns.cpp')
| -rw-r--r-- | src/xmlpatterns/functions/qpatternmatchingfns.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xmlpatterns/functions/qpatternmatchingfns.cpp b/src/xmlpatterns/functions/qpatternmatchingfns.cpp index cb421cb..a7275f6 100644 --- a/src/xmlpatterns/functions/qpatternmatchingfns.cpp +++ b/src/xmlpatterns/functions/qpatternmatchingfns.cpp @@ -82,7 +82,7 @@ Item ReplaceFN::evaluateSingleton(const DynamicContext::Ptr &context) const if(arg) input = arg.stringValue(); - const QString replacement(m_replacementString.isNull() ? parseReplacement(regexp.numCaptures(), context) + const QString replacement(m_replacementString.isNull() ? parseReplacement(regexp.captureCount(), context) : m_replacementString); |