diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 01:12:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 01:12:33 (GMT) |
| commit | 8a7de547942c9a660dfc45c176ea1a3027bbf99a (patch) | |
| tree | ac1eaa76630f7bbc2fc3165c2c209d2a973fd929 /src/xml/dom | |
| parent | de300d7a41b0e428ba11e6061c39580c54012dc9 (diff) | |
| parent | 7c2b43a5c824ed4d5493c233d84222be9f5865c3 (diff) | |
| download | Qt-8a7de547942c9a660dfc45c176ea1a3027bbf99a.zip Qt-8a7de547942c9a660dfc45c176ea1a3027bbf99a.tar.gz Qt-8a7de547942c9a660dfc45c176ea1a3027bbf99a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (203 commits)
Fix compilation of OpenVG.
Fixed wrong qmake logic for Symbian.
Fixed a bug where a proxy widget received FocusIn over and over.
Fixed broken test.
Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles.
Fix dependency so it works also on massive parrallel systems
Set PM_MenuScrollerHeight to zero
Change QS60Style to use combobox popup menu
This should likely get webkit linking again on windows/sbsv2
Handle Symbian's file name encoding, correctly.
Fix linking issues of QtOpenVG.dll
Fixed Symbian applications with DESTDIR set.
Removed a warning about generated rss files.
Revert "Temporarily disable problematic dll."
Fixed "Cannot install protected application" message on Symbian.
Worked around a crash in the elf2e32 postlinker tool.
Worked around case differences in Symbian^3 and Gnupoc.
Enabled compilation of plugins again.
Make sure target path exists in qmake_extra_pre_targetdep.flm
Added close button to Anomaly demo browser
...
Diffstat (limited to 'src/xml/dom')
| -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 }; /************************************************************** |