diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-14 18:42:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-14 18:42:38 (GMT) |
| commit | 039db4ed6b542fccd8f95b637d4199944da58f06 (patch) | |
| tree | ec8a6381ecce2b58ce497d93cd597f0a7d6d7abe /tools/qdoc3/pagegenerator.cpp | |
| parent | 9358d77fc1de64d2a8a06bfa4095dcde9f9b009b (diff) | |
| parent | c089696d8de41762a1e8abb067b2721ce3de4d27 (diff) | |
| download | Qt-039db4ed6b542fccd8f95b637d4199944da58f06.zip Qt-039db4ed6b542fccd8f95b637d4199944da58f06.tar.gz Qt-039db4ed6b542fccd8f95b637d4199944da58f06.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (53 commits)
QNAM: Do not need QNetworkSession for data://
Workaround for QFileSystemWatcher regression
Revert "qmake: pass include directories to MS resource compiler"
Fix User 46 Panic in bearer management on Symbian.
Assistant: Insert all keywords with empty ids, as ids are not mendatory.
qmake: delete .pdb file when making 'distclean' instead of 'clean'
qmake: pass include directories to MS resource compiler
use specified pkg-config
qmake/symbian: Add icons with backslashes in pkg files
Make qtconfig help messages translatable
remove exec bits again ...
Add TIFFClose to QTIffHandler::option() to avoid memory leak
[QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
Added missing QtWebKit example files and some whitespace fixes.
Added missing native separator transforms.
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
Doc: correct spelling
...
Diffstat (limited to 'tools/qdoc3/pagegenerator.cpp')
| -rw-r--r-- | tools/qdoc3/pagegenerator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp index a187c2e..37dc191 100644 --- a/tools/qdoc3/pagegenerator.cpp +++ b/tools/qdoc3/pagegenerator.cpp @@ -310,10 +310,10 @@ PageGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker) const FakeNode *fakeNode = static_cast<const FakeNode *>(node); if (fakeNode->subType() == Node::ExternalPage) return; -#ifdef QDOC_QML + if (fakeNode->subType() == Node::Image) + return; if (fakeNode->subType() == Node::QmlPropertyGroup) return; -#endif if (fakeNode->subType() == Node::Page) { if (node->count() > 0) qDebug("PAGE %s HAS CHILDREN", qPrintable(fakeNode->title())); |