summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDavid Boddie <dboddie@trolltech.com>2009-06-09 13:27:55 (GMT)
committerDavid Boddie <dboddie@trolltech.com>2009-06-09 13:27:55 (GMT)
commit8e189954eec4a3bebf49fa84f659e59e455a936e (patch)
treee95d969e952ef872de93a0d08258e7999969ecfd /tools
parentd367ee08d1a07f1a30665b77ec11acec96e65a65 (diff)
parentb9f5e151b3c0bca74136720c5b42c9a93c8f25a8 (diff)
downloadQt-8e189954eec4a3bebf49fa84f659e59e455a936e.zip
Qt-8e189954eec4a3bebf49fa84f659e59e455a936e.tar.gz
Qt-8e189954eec4a3bebf49fa84f659e59e455a936e.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/htmlgenerator.cpp3
-rw-r--r--tools/qdoc3/test/classic.css2
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 90d3b04..0c21534 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1073,6 +1073,7 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
if (!s->inherited.isEmpty())
needOtherSection = true;
} else {
+ out() << "<hr />\n";
out() << "<a name=\""
<< registerRef((*s).name.toLower())
<< "\"></a>\n";
@@ -2335,7 +2336,7 @@ void HtmlGenerator::generateSynopsis(const Node *node,
QString HtmlGenerator::highlightedCode(const QString& markedCode,
CodeMarker *marker,
const Node *relative,
- CodeMarker::SynopsisStyle style,
+ CodeMarker::SynopsisStyle ,
bool nameAlignment)
{
QString src = markedCode;
diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css
index 3e2370d..85bb348 100644
--- a/tools/qdoc3/test/classic.css
+++ b/tools/qdoc3/test/classic.css
@@ -17,7 +17,7 @@ h3.fn,span.fn
background-color: #e0eff6;
border-width: 1px;
border-style: solid;
- border-color: #3388be #e0eff6 #e9f8ff #e0eff6;
+ border-color: #3388be #3388be #e9f8ff #3388be;
font-weight: bold;
padding: 6px 0px 6px 10px;
}