diff options
| author | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2015-12-16 12:15:01 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2016-01-04 14:19:00 +0000 |
| commit | 1bdf30d40f800199d76a4c8577d40a455a5ed52a (patch) | |
| tree | 30bdae8d419c4dbcb592fe7e6174cdbb30368fd3 /src/qdoc/doc/qdoc-manual-markupcmds.qdoc | |
| parent | 3c5cc414711f0d17bb32e7282eb21588947465a5 (diff) | |
qdoc-doc: Combine code snippets into a single block.
Having a \dots before the \code rendered the dots in a separate code
display box, rather than as the start of the rest of the block. The
same didn't happen at the end, but adjust it symmetrically anyway.
Also fixed an over-escaped \snippet.
Change-Id: I42253260745547c88c44a7ecaf937bb8303030a6
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Diffstat (limited to 'src/qdoc/doc/qdoc-manual-markupcmds.qdoc')
| -rw-r--r-- | src/qdoc/doc/qdoc-manual-markupcmds.qdoc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc index 06a4cfd2c..efacda540 100644 --- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc +++ b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc @@ -1729,18 +1729,14 @@ The text following the file name is the unique identifier for the snippet. This is used to delimit the quoted code in the relevant snippet file, as shown in the following example that corresponds to - the above \c{\\snippet} command: + the above \c{\snippet} command: + \quotefromfile snippets/textdocument-resources/main.cpp + \skipto QImage::Format_RGB32 \dots - \code - QImage image(64, 64, QImage::Format_RGB32); - image.fill(qRgb(255, 160, 128)); - - //! [Adding a resource] - document->addResource(QTextDocument::ImageResource, - QUrl("mydata://image.png"), QVariant(image)); - //! [Adding a resource] - \endcode + \codeline + \printuntil QTextDocument::ImageResource + \printuntil Adding a resource \dots \target codeline-command |