diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-22 11:27:43 (GMT) |
|---|---|---|
| committer | Toby Tomkins <toby.tomkins@nokia.com> | 2010-07-23 01:16:42 (GMT) |
| commit | 9a61d3f6c8a443791c1a379e4da80caf82737e9c (patch) | |
| tree | 84eddc5df0163a25a4438a2ecabd749f65bfa1fd /tools/qdoc3/htmlgenerator.cpp | |
| parent | c6640f44cd782c249b2cb5ae39ad4604c6828094 (diff) | |
| download | Qt-9a61d3f6c8a443791c1a379e4da80caf82737e9c.zip Qt-9a61d3f6c8a443791c1a379e4da80caf82737e9c.tar.gz Qt-9a61d3f6c8a443791c1a379e4da80caf82737e9c.tar.bz2 | |
qdoc: Fixed reporting of read-only status for QML properties.
Task-number: QTBUG-11512
(cherry picked from commit d8908922f339892fee4275a433e2bf6da87ae055)
Diffstat (limited to 'tools/qdoc3/htmlgenerator.cpp')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 043731d..7e081db 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -4094,8 +4094,11 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node, out() << "<td class=\"tblQmlPropNode\"><p>"; out() << "<a name=\"" + refForNode(qpn) + "\"></a>"; - if (!qpn->isWritable()) + + if (!qpn->isWritable(myTree)) { + qDebug() << "QPN:" << qpn->name(); out() << "<span class=\"qmlreadonly\">read-only</span>"; + } if (qpgn->isDefault()) out() << "<span class=\"qmldefault\">default</span>"; generateQmlItem(qpn, relative, marker, false); @@ -4111,10 +4114,10 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node, out() << "<div class=\"qmlproto\">"; out() << "<table class=\"qmlname\">"; //out() << "<tr>"; - 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 class=\"tblQmlFuncNode\"><p>"; out() << "<a name=\"" + refForNode(qsn) + "\"></a>"; generateSynopsis(qsn,relative,marker,CodeMarker::Detailed,false); |