diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 22:20:12 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 22:20:12 (GMT) |
| commit | 3b699af494d7e9827b9eb26658b8cb4cb3e84dab (patch) | |
| tree | 2aa27bed49146353ffba06bf03bab83b730fa92b /doc/src/snippets/code/src_script_qscriptcontext.cpp | |
| parent | ef30a6f336d55c813423bf139d8363f50181179f (diff) | |
| parent | cab764871cc9379ca9757f41dca9e3ed9e9d34aa (diff) | |
| download | Qt-3b699af494d7e9827b9eb26658b8cb4cb3e84dab.zip Qt-3b699af494d7e9827b9eb26658b8cb4cb3e84dab.tar.gz Qt-3b699af494d7e9827b9eb26658b8cb4cb3e84dab.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
suppress pointer aliasing warnings
Fix compilation with namespace.
Assistant: Make ~AbstractHelpViewer() virtual.
Prepare German translations for 4.7 (except Quick).
tr()-Fixes in Assistant/QHelpLib code.
Remove QObject::tr() in the network module code.
Diffstat (limited to 'doc/src/snippets/code/src_script_qscriptcontext.cpp')
0 files changed, 0 insertions, 0 deletions