diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-26 21:42:57 (GMT) |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-26 21:42:57 (GMT) |
commit | e028a54690f2fedfae6da19fb24b7401e4a71e56 (patch) | |
tree | 72c038e84d9fb1063c970a121949d898442c5648 /src/xmlpatterns/expr/qevaluationcache_p.h | |
parent | d54407928be05781ede2358baba2f2f91749cc80 (diff) | |
parent | 6661f5c2222c145d854e225076195b37672637d2 (diff) | |
download | Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.zip Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.gz Qt-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.bz2 |
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
Diffstat (limited to 'src/xmlpatterns/expr/qevaluationcache_p.h')
-rw-r--r-- | src/xmlpatterns/expr/qevaluationcache_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h index 4111634..67ee5c2 100644 --- a/src/xmlpatterns/expr/qevaluationcache_p.h +++ b/src/xmlpatterns/expr/qevaluationcache_p.h @@ -125,6 +125,7 @@ namespace QPatternist private: static DynamicContext::Ptr topFocusContext(const DynamicContext::Ptr &context); const VariableDeclaration* m_declaration; + bool m_declarationUsedByMany; /** * This variable must not be called m_slot. If it so, a compiler bug on * HP-UX-aCC-64 is triggered in the constructor initializor. See the |