diff options
| author | Kevin Wright <kevin.wright@nokia.com> | 2010-08-02 15:43:42 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-08-05 08:44:08 (GMT) |
| commit | 8f85d0e13245279fdb5a0dd0cf9c0c64615a6125 (patch) | |
| tree | 031cb0c18ef1fb3673af3df0de1121c500044262 /demos/qtdemo | |
| parent | 475cb2c4244c1124e37f2ac500fb9fb6eb8ee442 (diff) | |
| download | Qt-8f85d0e13245279fdb5a0dd0cf9c0c64615a6125.zip Qt-8f85d0e13245279fdb5a0dd0cf9c0c64615a6125.tar.gz Qt-8f85d0e13245279fdb5a0dd0cf9c0c64615a6125.tar.bz2 | |
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.
(cherry picked from commit e55fd8c9790863f2d6001bda617a9d87be61f29b)
Diffstat (limited to 'demos/qtdemo')
| -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)) { |