From 3810b99b4cad52696eee9624b5c5995adb17bb39 Mon Sep 17 00:00:00 2001 From: Geir Vattekar Date: Mon, 7 Mar 2011 16:26:19 +0100 Subject: 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) --- demos/qtdemo/examplecontent.cpp | 6 ++++-- 1 file 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"); -- cgit v0.12