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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits)
  Removed the unfinished sentence. Fix for QTBUG-10173.
  Fixed the addressbook tutorial and some spelling mistakes. Fix for QTBUG-7071 and QTBUG-10173
  Unbreak QImage::rgbSwapped() for many image formats.
  Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa)
  Doc: Adding content to installation guide and fixing printing bugs
  Cocoa: Active QDockWidget does not stay on top of inactive QDockWidget
  Made changes to qdoc to allow it to accept a "style level" flag
  Doc: Correcting bugs in the CSS
  Return 'Unknown' bearer type name for unknown bearer type.
  Update def files.
  Doc: updating index page, x platform and platform spec. Removing redundant style files
  Added notice that some links are online documents.
  Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
  Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
  configure: don't symlink the mkspecs/features directory
  Doc: adding changes to getting started and fixing redirection links
  doc: Fixed many qdoc errors.
  Fixed potential infinite loop in QFileSystemWatcher on Mac.
  qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
  Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/demos/qtdemo/examplecontent.cpp b/demos/qtdemo/examplecontent.cpp
index 19be3e0..65c078d 100644
--- a/demos/qtdemo/examplecontent.cpp
+++ b/demos/qtdemo/examplecontent.cpp
@@ -91,8 +91,8 @@ QString ExampleContent::loadDescription()
     if (paragraphs.length() < 1 && Colors::verbose)
         qDebug() << "- ExampleContent::loadDescription(): Could not load description:"
                  << MenuManager::instance()->info[this->name]["docfile"];
-    QString description = Colors::contentColor +
-        QLatin1String("Could not load description. Ensure that the documentation for Qt is built.");
+    QString description = Colors::contentColor + QLatin1String(""); 
+    //QLatin1String("Could not load description. Ensure that the documentation for Qt is built."); // QTBUG-12522: If there is no description why show an error to the user when qDebug above communications the issue (if it is indeed an issue at all) when demos are built?
     for (int p = 0; p < int(paragraphs.length()); ++p) {
         description = this->extractTextFromParagraph(paragraphs.item(p));
         if (this->isSummary(description)) {