diff options
| author | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-23 00:00:14 (GMT) |
|---|---|---|
| committer | Water-Team <water@pad.test.qt.nokia.com> | 2011-11-23 00:00:14 (GMT) |
| commit | 3a9b8ff032b56b61b0e91213ca898793f0f31795 (patch) | |
| tree | 3dc4ce838fb8ba3d36461b5126e9ec2f72e83010 /doc/src/snippets/code | |
| parent | 6f94f2a7f824e2c586390ae831dd638c8c71faeb (diff) | |
| parent | 5f2090f0f2280c32d06fbc5188ccb799d7b1a489 (diff) | |
| download | Qt-3a9b8ff032b56b61b0e91213ca898793f0f31795.zip Qt-3a9b8ff032b56b61b0e91213ca898793f0f31795.tar.gz Qt-3a9b8ff032b56b61b0e91213ca898793f0f31795.tar.bz2 | |
Merge branch '4.8-upstream' into master-water
Diffstat (limited to 'doc/src/snippets/code')
| -rw-r--r-- | doc/src/snippets/code/doc_src_examples_icons.cpp | 2 | ||||
| -rw-r--r-- | doc/src/snippets/code/doc_src_examples_imageviewer.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/snippets/code/doc_src_examples_icons.cpp b/doc/src/snippets/code/doc_src_examples_icons.cpp index 411c49f..dfb0182 100644 --- a/doc/src/snippets/code/doc_src_examples_icons.cpp +++ b/doc/src/snippets/code/doc_src_examples_icons.cpp @@ -40,5 +40,5 @@ //! [0] if (!condition) - qFatal("ASSERT: "condition" in file ..."); + qFatal("ASSERT: " condition " in file ..."); //! [0] diff --git a/doc/src/snippets/code/doc_src_examples_imageviewer.cpp b/doc/src/snippets/code/doc_src_examples_imageviewer.cpp index c86f8ac..07e50be 100644 --- a/doc/src/snippets/code/doc_src_examples_imageviewer.cpp +++ b/doc/src/snippets/code/doc_src_examples_imageviewer.cpp @@ -45,7 +45,7 @@ imageLabel->resize(imageLabel->pixmap()->size()); //! [1] if (!imageLabel->pixmap()) - qFatal("ASSERT: "imageLabel->pixmap()" in file ..."); + qFatal("ASSERT: " imageLabel->pixmap() " in file ..."); //! [1] |