summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeir Vattekar <geir.vattekar@nokia.com>2011-03-07 15:26:19 (GMT)
committerGeir Vattekar <geir.vattekar@nokia.com>2011-03-14 17:22:35 (GMT)
commit3810b99b4cad52696eee9624b5c5995adb17bb39 (patch)
tree5cfdce8941ff684ced55c979605d9c7bf977e08e
parent06a29fdb81a9ccb992062acf8ecd36b7e97494a3 (diff)
downloadQt-3810b99b4cad52696eee9624b5c5995adb17bb39.zip
Qt-3810b99b4cad52696eee9624b5c5995adb17bb39.tar.gz
Qt-3810b99b4cad52696eee9624b5c5995adb17bb39.tar.bz2
Doc: QtDemo now gives error message when example doc cannot be loaded
Task-number: QTBUG-16004 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 07ce2c31c3e020ad7c5ea4d7cc94296b6860adac)
-rw-r--r--demos/qtdemo/examplecontent.cpp6
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");