From 11084503c711f862baa4d4027a7b97cedae1034e Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Fri, 20 May 2011 18:02:58 +1000
Subject: Fixed compilation.

The same bug was fixed two different ways in Qt 4.7 and 4.8, and not
merged correctly.  Use the fix from 4.7.
---
 src/xmlpatterns/expr/qevaluationcache.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xmlpatterns/expr/qevaluationcache.cpp b/src/xmlpatterns/expr/qevaluationcache.cpp
index 19d1784..67109eb 100644
--- a/src/xmlpatterns/expr/qevaluationcache.cpp
+++ b/src/xmlpatterns/expr/qevaluationcache.cpp
@@ -49,7 +49,7 @@ template<bool IsForGlobal>
 EvaluationCache<IsForGlobal>::EvaluationCache(const Expression::Ptr &op,
                                               const VariableDeclaration *varDecl,
                                               const VariableSlotID aSlot) : SingleContainer(op)
-                                                                          , m_declaration(varDecl.constData())
+                                                                          , m_declaration(varDecl)
                                                                           , m_varSlot(aSlot)
 {
     Q_ASSERT(m_declaration);
-- 
cgit v0.12