diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-04-16 12:04:34 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-04-16 12:04:34 +0200 |
| commit | 9bd032355163d92cda5e7e59ecd21214b131f187 (patch) | |
| tree | 002fa12558505683143c7eb08949a3d225bf0712 /src/tools/qdoc/htmlgenerator.cpp | |
| parent | d037d25c3d5236623371cf051aaf6a9e59792ba7 (diff) | |
| parent | 41673c45dde2eb95ee21dd918235218399f2be2c (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
configure
src/corelib/io/qurl.cpp
src/gui/kernel/qwindow.cpp
src/tools/moc/generator.cpp
src/widgets/kernel/qwidget_qpa.cpp
src/widgets/styles/qstyle.h
src/widgets/widgets/qtabbar.cpp
tests/auto/corelib/codecs/utf8/tst_utf8.cpp
Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 38 |
1 files changed, 12 insertions, 26 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index 9434ced42f1..24dd31e0b55 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -775,6 +775,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, if (atom->type() == Atom::Image) out() << "<p class=\"centerAlign\">"; if (fileName.isEmpty()) { + relative->location().warning(tr("Missing image: %1").arg(protectEnc(atom->string()))); out() << "<font color=\"red\">[Missing image " << protectEnc(atom->string()) << "]</font>"; } @@ -4072,16 +4073,11 @@ void HtmlGenerator::generateDetailedQmlMember(Node *node, out() << "<td class=\"tblQmlPropNode\"><p>"; out() << "<a name=\"" + refForNode(qpn) + "\"></a>"; - int ro = qpn->getReadOnly(); - if (ro < 0) { - if (!qpn->isWritable(tree_)) { - out() << "<span class=\"qmlreadonly\">read-only</span>"; - } - } - else if (ro > 0) { + if (!qpn->isReadOnlySet()) + qpn->setReadOnly(!qpn->isWritable(tree_)); + if (qpn->isReadOnly()) out() << "<span class=\"qmlreadonly\">read-only</span>"; - } - if (qpgn->isDefault()) + if (qpn->isDefault()) out() << "<span class=\"qmldefault\">default</span>"; generateQmlItem(qpn, relative, marker, false); out() << "</p></td></tr>"; @@ -4113,16 +4109,12 @@ void HtmlGenerator::generateDetailedQmlMember(Node *node, out() << "<tr valign=\"top\" class=\"odd\">"; out() << "<td class=\"tblQmlPropNode\"><p>"; out() << "<a name=\"" + refForNode(qpn) + "\"></a>"; - int ro = qpn->getReadOnly(); - if (ro < 0) { - const ClassNode* cn = qpn->declarativeCppNode(); - if (cn && !qpn->isWritable(tree_)) { - out() << "<span class=\"qmlreadonly\">read-only</span>"; - } + if (!qpn->isReadOnlySet()) { + if (qpn->declarativeCppNode()) + qpn->setReadOnly(!qpn->isWritable(tree_)); } - else if (ro > 0) { + if (qpn->isReadOnly()) out() << "<span class=\"qmlreadonly\">read-only</span>"; - } if (qpn->isDefault()) out() << "<span class=\"qmldefault\">default</span>"; generateQmlItem(qpn, relative, marker, false); @@ -4145,16 +4137,10 @@ void HtmlGenerator::generateDetailedQmlMember(Node *node, out() << "<tr valign=\"top\" class=\"odd\">"; out() << "<td class=\"tblQmlPropNode\"><p>"; out() << "<a name=\"" + refForNode(q) + "\"></a>"; - - int ro = qpn->getReadOnly(); - if (ro < 0) { - if (!qpn->isWritable(tree_)) { - out() << "<span class=\"qmlreadonly\">read-only</span>"; - } - } - else if (ro > 0) { + if (!qpn->isReadOnlySet()) + qpn->setReadOnly(!qpn->isWritable(tree_)); + if (qpn->isReadOnly()) out() << "<span class=\"qmlreadonly\">read-only</span>"; - } if (qpn->isDefault()) out() << "<span class=\"qmldefault\">default</span>"; generateQmlItem(q, relative, marker, false); |