diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-03-09 08:19:10 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-03-09 08:19:10 (GMT) |
| commit | 97bc06f9129abdeda2f58dd001b6c5a596e22e41 (patch) | |
| tree | 520c4f02a96e750d16c34e67412a92b7fe755073 /demos | |
| parent | 133db91952ede661750489d5d0d1eea32cc60994 (diff) | |
| parent | a2b2961fb9050c26ef99ebadb642f4178185a31f (diff) | |
| download | Qt-97bc06f9129abdeda2f58dd001b6c5a596e22e41.zip Qt-97bc06f9129abdeda2f58dd001b6c5a596e22e41.tar.gz Qt-97bc06f9129abdeda2f58dd001b6c5a596e22e41.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/qtdemo/examplecontent.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/demos/qtdemo/examplecontent.cpp b/demos/qtdemo/examplecontent.cpp index 64737c3..5385259 100644 --- a/demos/qtdemo/examplecontent.cpp +++ b/demos/qtdemo/examplecontent.cpp @@ -83,8 +83,10 @@ QString ExampleContent::loadDescription() int errorLine, errorColumn; QDomDocument exampleDoc; - if (!exampleDoc.setContent(ba, false, &errorMsg, &errorLine, &errorColumn)) { - qDebug() << errorMsg << errorLine << errorColumn; + if (ba.isEmpty()) { + qDebug() << "No documentation found for" << name << "Is the documentation built?"; + } else if (!exampleDoc.setContent(ba, false, &errorMsg, &errorLine, &errorColumn)) { + qDebug() << "Error loading documentation for " << name << ": " << errorMsg << errorLine << errorColumn; } QDomNodeList paragraphs = exampleDoc.elementsByTagName("p"); |