diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-19 09:53:42 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-19 09:54:12 +0200 |
| commit | 55a36aed7935984846db2342e37160057cb3bec8 (patch) | |
| tree | b84f611333fe9ec6ecda62c9ea47f954f59bc394 /src/corelib/doc | |
| parent | a9a87deb685600aebd9ed1cec82ad668afca88d9 (diff) | |
| parent | 734324c37cb9d8417aa86f76fc81dadc21be2156 (diff) | |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: If7f46d56cf0b0b79f7fc8955a01964121b900d07
Diffstat (limited to 'src/corelib/doc')
| -rw-r--r-- | src/corelib/doc/snippets/code/src_corelib_plugin_quuid.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/doc/snippets/pointer/pointer.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_plugin_quuid.cpp b/src/corelib/doc/snippets/code/src_corelib_plugin_quuid.cpp index 662ce35054..34c81189c1 100644 --- a/src/corelib/doc/snippets/code/src_corelib_plugin_quuid.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_plugin_quuid.cpp @@ -40,5 +40,5 @@ //! [0] // {67C8770B-44F1-410A-AB9A-F9B5446F13EE} -QUuid IID_MyInterface(0x67c8770b, 0x44f1, 0x410a, 0xab, 0x9a, 0xf9, 0xb5, 0x44, 0x6f, 0x13, 0xee) +QUuid IID_MyInterface(0x67c8770b, 0x44f1, 0x410a, 0xab, 0x9a, 0xf9, 0xb5, 0x44, 0x6f, 0x13, 0xee); //! [0] diff --git a/src/corelib/doc/snippets/pointer/pointer.cpp b/src/corelib/doc/snippets/pointer/pointer.cpp index 31b4959651..503f2dfccd 100644 --- a/src/corelib/doc/snippets/pointer/pointer.cpp +++ b/src/corelib/doc/snippets/pointer/pointer.cpp @@ -53,7 +53,8 @@ int main(int argc, char *argv[]) //! [1] if (label) -//! [1] //! [2] +//! [1] +//! [2] label->show(); //! [2] return 0; |