Fixed compilation on AIX 6.1 with xlC 10.1

Task-number: QTBUG-3368
Reviewed-by: Thiago Macieira
(cherry picked from commit 223b5de63e56c6c3dfbc5000b460baa653ab3f75)

4 files changed, 12 insertions, 6 deletions

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
index 2a407d4..188b68f 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -98,6 +98,10 @@
 /* regardless of operating environment */
 #if defined(_AIX)
 #define WTF_PLATFORM_AIX 1
+/* 64-bit mode on AIX */
+#ifdef __64BIT__
+#define WTF_PLATFORM_AIX64 1
+#endif
 #endif
 
 /* PLATFORM(HPUX) */
@@ -708,6 +712,8 @@
 #define WTF_USE_JSVALUE64 1
 #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64)
 #define WTF_USE_JSVALUE64 1
+#elif PLATFORM(AIX64)
+#define WTF_USE_JSVALUE64 1
 #elif PLATFORM(ARM) || PLATFORM(PPC64)
 #define WTF_USE_JSVALUE32 1
 #elif PLATFORM(WIN_OS) && COMPILER(MINGW)
diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp
index 8446a56..62ec57c 100644
--- a/src/gui/painting/qpathclipper.cpp
+++ b/src/gui/painting/qpathclipper.cpp
@@ -1650,7 +1650,7 @@ static void clear(QWingedEdge& list, int edge, QPathEdge::Traversal traversal)
 template <typename InputIterator>
 InputIterator qFuzzyFind(InputIterator first, InputIterator last, qreal val)
 {
-    while (first != last && !qFuzzyCompare(qreal(*first), qreal(val)))
+    while (first != last && !QT_PREPEND_NAMESPACE(qFuzzyCompare)(qreal(*first), qreal(val)))
         ++first;
     return first;
 }
diff --git a/src/xmlpatterns/data/qderivedinteger_p.h b/src/xmlpatterns/data/qderivedinteger_p.h
index d3208ae..e1d70b7 100644
--- a/src/xmlpatterns/data/qderivedinteger_p.h
+++ b/src/xmlpatterns/data/qderivedinteger_p.h
@@ -401,18 +401,18 @@ namespace QPatternist
             {
                 return ValidationError::createError(QtXmlPatterns::tr(
                     "Value %1 of type %2 exceeds maximum (%3).")
-                    .arg(formatData(static_cast<xsInteger>(num)))
+                    .arg(QPatternist::formatData(static_cast<xsInteger>(num)))
                     .arg(formatType(np, itemType()))
-                    .arg(formatData(static_cast<xsInteger>(maxInclusive))));
+                    .arg(QPatternist::formatData(static_cast<xsInteger>(maxInclusive))));
             }
             else if((limitsUsage & LimitDownwards) &&
                     lessThan(num, minimum))
             {
                 return ValidationError::createError(QtXmlPatterns::tr(
                     "Value %1 of type %2 is below minimum (%3).")
-                    .arg(formatData(static_cast<xsInteger>(num)))
+                    .arg(QPatternist::formatData(static_cast<xsInteger>(num)))
                     .arg(formatType(np, itemType()))
-                    .arg(formatData(static_cast<xsInteger>(minInclusive))));
+                    .arg(QPatternist::formatData(static_cast<xsInteger>(minInclusive))));
             }
             else
                 return AtomicValue::Ptr(new DerivedInteger(num));
diff --git a/src/xmlpatterns/functions/qcomparingaggregator.cpp b/src/xmlpatterns/functions/qcomparingaggregator.cpp
index d15dac4..fd91cff 100644
--- a/src/xmlpatterns/functions/qcomparingaggregator.cpp
+++ b/src/xmlpatterns/functions/qcomparingaggregator.cpp
@@ -195,7 +195,7 @@ ComparingAggregator<oper, result>::typeCheck(const StaticContext::Ptr &context,
             !BuiltinTypes::xsYearMonthDuration->xdtTypeMatches(t1))
     {
         context->error(QtXmlPatterns::tr("The first argument to %1 cannot be of type %2.")
-                          .arg(formatFunction(context->namePool(), signature()))
+                          .arg(QPatternist::formatFunction(context->namePool(), signature()))
                           .arg(formatType(context->namePool(), m_operands.first()->staticType())),
                        ReportContext::FORG0006, this);
         return me;