diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-05 11:05:28 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-06 11:41:24 +0100 |
| commit | 34933799fa5ccee00981ee7506cd58aa1c06bbad (patch) | |
| tree | 2c2d5acac092be41aa950ee393dbc4777199fed3 /src/plugins/texteditor/helpitem.cpp | |
| parent | f85df65594ea43273f76f6c74aeb98bb1a90a396 (diff) | |
| download | qt-creator-34933799fa5ccee00981ee7506cd58aa1c06bbad.tar.gz | |
TextEditor: Compile with QT_NO_CAST_FROM_ASCII.
Change-Id: I8fa683c4f68d6e3d3a3eb95acf2f54f8c56b87b7
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Diffstat (limited to 'src/plugins/texteditor/helpitem.cpp')
| -rw-r--r-- | src/plugins/texteditor/helpitem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/texteditor/helpitem.cpp b/src/plugins/texteditor/helpitem.cpp index 3e1f90560a..d71253e9b7 100644 --- a/src/plugins/texteditor/helpitem.cpp +++ b/src/plugins/texteditor/helpitem.cpp @@ -99,7 +99,7 @@ QString HelpItem::extractContent(bool extended) const helpLinks.insert(m_helpId, m_helpId); } foreach (const QUrl &url, helpLinks) { - const QByteArray &html = Core::HelpManager::instance()->fileData(url); + const QString html = QString::fromUtf8(Core::HelpManager::instance()->fileData(url)); switch (m_category) { case Brief: contents = htmlExtractor.getClassOrNamespaceBrief(html, m_docMark); |