summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-07-02 09:25:46 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-07-02 09:25:46 (GMT)
commit6b63f3e6b3b38822115a06b5229f4b006c9eb290 (patch)
tree323ba7bf430c7853b594da8223ab240ce65c8c2c
parent29e6a5c1b1a17b8080c2dcae92dcea11b591907d (diff)
downloadQt-6b63f3e6b3b38822115a06b5229f4b006c9eb290.zip
Qt-6b63f3e6b3b38822115a06b5229f4b006c9eb290.tar.gz
Qt-6b63f3e6b3b38822115a06b5229f4b006c9eb290.tar.bz2
qdoc: Fixed spacing before "default" and "read-only".
Task-number: QTBUG-11346
-rwxr-xr-xdoc/src/template/style/style.css2
-rw-r--r--tools/qdoc3/htmlgenerator.cpp13
-rw-r--r--tools/qdoc3/test/style/style.css2
3 files changed, 10 insertions, 7 deletions
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index f1a63a9..b174622 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -829,12 +829,14 @@
}
.qmlreadonly
{
+ padding-left: 5px;
float: right;
color: #254117;
}
.qmldefault
{
+ padding-left: 5px;
float: right;
color: red;
}
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 9f745c5..e1916b4 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -4464,14 +4464,13 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
while (p != qpgn->childNodes().end()) {
if ((*p)->type() == Node::QmlProperty) {
qpn = static_cast<const QmlPropertyNode*>(*p);
-
- if (++numTableRows % 2 == 1)
- out() << "<tr class=\"odd\">";
- else
- out() << "<tr class=\"even\">";
+ if (++numTableRows % 2 == 1)
+ out() << "<tr class=\"odd\">";
+ else
+ out() << "<tr class=\"even\">";
- out() << "<td><p>";
- //out() << "<tr><td>"; // old
+ out() << "<td><p>";
+
out() << "<a name=\"" + refForNode(qpn) + "\"></a>";
if (!qpn->isWritable())
out() << "<span class=\"qmlreadonly\">read-only</span>";
diff --git a/tools/qdoc3/test/style/style.css b/tools/qdoc3/test/style/style.css
index 9c290f5..dff0772 100644
--- a/tools/qdoc3/test/style/style.css
+++ b/tools/qdoc3/test/style/style.css
@@ -776,12 +776,14 @@
}
.qmlreadonly
{
+ padding-left: 3px;
float: right;
color: #254117;
}
.qmldefault
{
+ padding-left: 3px;
float: right;
color: red;
}