diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 14:59:08 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 14:59:08 (GMT) |
commit | d418a8336d610f9d8d4d1e75d55cadeec24eef7a (patch) | |
tree | 5ff831e6ac944c4bedd49bec6ed111ed0be89c61 /tools | |
parent | 99e1dc904eab4b38c90803f13d73f90b9c048920 (diff) | |
parent | e581386148a9615ef6c11eb3ae6735d0fa9668f6 (diff) | |
download | Qt-d418a8336d610f9d8d4d1e75d55cadeec24eef7a.zip Qt-d418a8336d610f9d8d4d1e75d55cadeec24eef7a.tar.gz Qt-d418a8336d610f9d8d4d1e75d55cadeec24eef7a.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
doc: Added a missing \sa command, plus a \l in the text.
Improve the performance of the Anomaly browser demo
doc: Fixed typos.
Fixed QResource to respect the explicitely set locale
Change QHostInfo to use 5 parallel lookup threads
Doc: fix typo
fix Cocoa build
Diffstat (limited to 'tools')
-rw-r--r-- | tools/qdoc3/cppcodeparser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index 41a2456..9ec7fdf 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -2318,9 +2318,9 @@ void CppCodeParser::createExampleFileNodes(FakeNode *fake) exampleFile.mid(sizeOfBoringPartOfName), Node::File); foreach (const QString &imageFile, imageFiles) { - FakeNode* newFake = new FakeNode(fake, - imageFile.mid(sizeOfBoringPartOfName), - Node::Image); + new FakeNode(fake, + imageFile.mid(sizeOfBoringPartOfName), + Node::Image); } } |