diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-05 02:12:31 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-05 02:12:31 (GMT) |
| commit | 5a98d58c1ed78262c20b05aa178a92b4a1a097df (patch) | |
| tree | 00c8c459c2bdbf438a35e5087250319d4766fe29 /demos/qtdemo/examplecontent.cpp | |
| parent | 7de5f19f0f62f181132394da6d7b2c8484cd42d9 (diff) | |
| parent | 5749421fdaff0305d217712e3174c85a76b367c4 (diff) | |
| download | Qt-5a98d58c1ed78262c20b05aa178a92b4a1a097df.zip Qt-5a98d58c1ed78262c20b05aa178a92b4a1a097df.tar.gz Qt-5a98d58c1ed78262c20b05aa178a92b4a1a097df.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'demos/qtdemo/examplecontent.cpp')
| -rw-r--r-- | demos/qtdemo/examplecontent.cpp | 4 |
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)) { |