diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 04:06:02 (GMT) |
---|---|---|
committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 04:06:02 (GMT) |
commit | f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682 (patch) | |
tree | 65f3b637a19ff47fcc97e3f22deeae7d843cad17 /src/xml/dom/qdom.cpp | |
parent | 331ad8eb0aedb4baefcaf6f08a8e0ce440a32b06 (diff) | |
parent | 8a7de547942c9a660dfc45c176ea1a3027bbf99a (diff) | |
download | Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.zip Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.gz Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.bz2 |
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'src/xml/dom/qdom.cpp')
-rw-r--r-- | src/xml/dom/qdom.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 0150515..1267e7e 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -625,6 +625,11 @@ private: bool cdata; bool nsProcessing; QXmlLocator *locator; + +#ifdef Q_OS_SYMBIAN + // Workaround crash in elf2e32 under Wine. + virtual void dummy() {} +#endif }; /************************************************************** |