diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
| commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
| tree | 598d682291945055e4f6feb08a228212648482c1 /src/tools/qdoc/node.cpp | |
| parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
| parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'src/tools/qdoc/node.cpp')
| -rw-r--r-- | src/tools/qdoc/node.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp index 13c51c721d..e4350f1d9e 100644 --- a/src/tools/qdoc/node.cpp +++ b/src/tools/qdoc/node.cpp @@ -98,6 +98,7 @@ Node::Node(Type type, InnerNode *parent, const QString& name) safeness_(UnspecifiedSafeness), pageType_(NoPageType), status_(Commendable), + indexNodeFlag_(false), parent_(parent), relatesTo_(0), name_(name) @@ -513,8 +514,8 @@ QString Node::ditaXmlHref() else { href = fileBase(); } - if (!href.endsWith(".xml")) - href += ".xml"; + if (!href.endsWith(".xml") && !href.endsWith(".dita")) + href += ".dita"; return href + QLatin1Char('#') + guid(); } |