Merge remote branch 'mainline/4.6' into 4.6

Conflicts:
	tools/configure/configureapp.cpp

2 files changed, 2 insertions, 2 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);
 
 
diff --git a/src/xmlpatterns/functions/qpatternplatform_p.h b/src/xmlpatterns/functions/qpatternplatform_p.h
index e007381..a85cd0c 100644
--- a/src/xmlpatterns/functions/qpatternplatform_p.h
+++ b/src/xmlpatterns/functions/qpatternplatform_p.h
@@ -180,7 +180,7 @@ namespace QPatternist
     inline int PatternPlatform::captureCount() const
     {
         if(m_compiledParts.testFlag(PatternPrecompiled))
-            return m_pattern.numCaptures();
+            return m_pattern.captureCount();
         else
             return -1;
     }