diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-28 14:15:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-28 14:15:52 (GMT) |
| commit | 9da305aedfaa5da5a3059c99ac5a5389dab42b10 (patch) | |
| tree | da0e106708be0439444fba362e044a709e0389bd /tools | |
| parent | 369f899e69362b2156800f8c90dfb0bdbe5f2598 (diff) | |
| parent | 19fc2c24f02ecef0c9a466d5351aa44ceb973bf3 (diff) | |
| download | Qt-9da305aedfaa5da5a3059c99ac5a5389dab42b10.zip Qt-9da305aedfaa5da5a3059c99ac5a5389dab42b10.tar.gz Qt-9da305aedfaa5da5a3059c99ac5a5389dab42b10.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:
qdoc: Fixed the model/view programming page; tried a style change.
fix visibility detection for g++ with a qualified binary name
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/doc.cpp | 12 | ||||
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 3 |
2 files changed, 3 insertions, 12 deletions
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp index 5716626..280f055 100644 --- a/tools/qdoc3/doc.cpp +++ b/tools/qdoc3/doc.cpp @@ -2746,18 +2746,6 @@ Doc::SectioningUnit Doc::granularity() const } } -#if notyet // ### -Doc::SectioningUnit Doc::sectioningUnit() const -{ - if (priv == 0 || priv->extra == 0) { - return DocPrivateExtra().sectioningUnit; - } - else { - return priv->extra->sectioningUnit; - } -} -#endif - const QSet<QString> &Doc::parameterNames() const { return priv == 0 ? *null_Set_QString() : priv->params; diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 16df0c0..b103981 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -4060,10 +4060,13 @@ int HtmlGenerator::hOffset(const Node *node) case Node::Class: return 2; case Node::Fake: + return 1; +#if 0 if (node->doc().briefText().isEmpty()) return 1; else return 2; +#endif case Node::Enum: case Node::Typedef: case Node::Function: |