Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (185 commits)
  qdoc: Avoid infinite loops in table of contents generation.
  Removed the documentation from the install rule.
  qdoc: Added the <othermeta> element.
  qdoc: Completed changing <section> structure.
  Doc: Fixed reference to absolete API in exceptionsafety.html
  Doc: Removed links to obsolete API in QResource
  Doc: Fixed broken links in QIcon::fromTheme()
  Doc: Fixed doc bug in undo framework example
  Doc: Fixed typo.
  qdoc: Changed <section> structure.
  Doc: Typo fixes
  Doc: Fixed snippet documenting QMetaObject::classInfo
  Doc: Cannot alter SelectionMode of a combobox's view
  qdoc: Added <publisher> and <permissions> elements.
  qdoc: Added <component> element to contain the module name.
  qdoc: Added <prodinfo> element and its contents to the metadata.
  Doc: Fixed a doc bug in the Rogue example
  Doc: Small change to QByteArray::resize()
  Doc: Small change to ListModel docs
  Doc: QtDemo now gives error message when example doc cannot be loaded
  ...

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");