diff options
author | David Faure <faure@kde.org> | 2011-09-29 13:31:39 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 15:22:07 +0200 |
commit | 7fb90066b3aa7e602466a61e0ffaadbf9002525c (patch) | |
tree | 2b8186c7fb45a8fc6f9ef53a77f17b83747684c6 /doc/src/snippets | |
parent | 87ae97c11ab9b298c0ce6701873b45fc3992b385 (diff) |
Move Qt::escape to QtCore
Merge-request: 56
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Change-Id: I25c5f46cf53a653db26dbeb92865e61f69980bfd
Reviewed-on: http://codereview.qt-project.org/5792
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'doc/src/snippets')
-rw-r--r-- | doc/src/snippets/code/src_corelib_tools_qstring.cpp | 7 | ||||
-rw-r--r-- | doc/src/snippets/code/src_gui_text_qtextdocument.cpp | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/snippets/code/src_corelib_tools_qstring.cpp b/doc/src/snippets/code/src_corelib_tools_qstring.cpp index 0cd1801beb..740ec54af5 100644 --- a/doc/src/snippets/code/src_corelib_tools_qstring.cpp +++ b/doc/src/snippets/code/src_corelib_tools_qstring.cpp @@ -85,3 +85,10 @@ if (str == QLatin1String("auto") //! [6] QLabel *label = new QLabel(QLatin1String("MOD"), this); //! [6] + + +//! [7] +QString plain = "#include <QtCore>" +QString html = Qt::escape(plain); +// html == "#include <QtCore>" +//! [7] diff --git a/doc/src/snippets/code/src_gui_text_qtextdocument.cpp b/doc/src/snippets/code/src_gui_text_qtextdocument.cpp index 775cc0fcd1..8165086d09 100644 --- a/doc/src/snippets/code/src_gui_text_qtextdocument.cpp +++ b/doc/src/snippets/code/src_gui_text_qtextdocument.cpp @@ -39,12 +39,5 @@ ****************************************************************************/ //! [0] -QString plain = "#include <QtCore>" -QString html = Qt::escape(plain); -// html == "#include <QtCore>" -//! [0] - - -//! [1] <html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8"></head><body>... -//! [1] +//! [0] |