diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-20 08:02:58 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-20 08:02:58 (GMT) |
| commit | 11084503c711f862baa4d4027a7b97cedae1034e (patch) | |
| tree | f0bf10da875b9ef777406699a13d187169296df1 /src | |
| parent | 156e313284191e47f0d2b78436836f17d34a50b2 (diff) | |
| download | Qt-11084503c711f862baa4d4027a7b97cedae1034e.zip Qt-11084503c711f862baa4d4027a7b97cedae1034e.tar.gz Qt-11084503c711f862baa4d4027a7b97cedae1034e.tar.bz2 | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xmlpatterns/expr/qevaluationcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |