diff options
author | Nico Vertriest <nico.vertriest@digia.com> | 2013-01-16 14:16:25 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-20 13:49:38 +0100 |
commit | 7f394bc7c4c61289885101f4d349a0bf573ac11d (patch) | |
tree | 9f0d8073ffd07db740026e7a3a9ae3276e6cb1bd /examples/activeqt | |
parent | d7dfd458f40b7de50ede0acb885ca9f3a65c3abb (diff) |
Doc: corrected snippet issues
In multiple.qdoc: replace \snippet with \input
Replaced statement "snippet" with "input"
Replaced "*;" with "*\"
Replaced raw-endraw with code-endcode
Replaced "raw" with "code"
Put code-endcode around numbered paragraphs
Resolved conflict in simple-demo.qdocinc
Task-number: QTBUG-29101
Change-Id: Idceb971d56551bf9e8bdce410360d418747731fe
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'examples/activeqt')
-rw-r--r-- | examples/activeqt/multiple/doc/src/multiple.qdoc | 2 | ||||
-rw-r--r-- | examples/activeqt/opengl/doc/src/opengl.qdoc | 2 | ||||
-rw-r--r-- | examples/activeqt/simple/doc/src/simple.qdoc | 8 | ||||
-rw-r--r-- | examples/activeqt/wrapper/doc/src/wrapper.qdoc | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/examples/activeqt/multiple/doc/src/multiple.qdoc b/examples/activeqt/multiple/doc/src/multiple.qdoc index fb7096b..607425d 100644 --- a/examples/activeqt/multiple/doc/src/multiple.qdoc +++ b/examples/activeqt/multiple/doc/src/multiple.qdoc @@ -66,5 +66,5 @@ WebBrowser to support ActiveX controls, and scripting to be enabled. - \snippet examples/multiple-demo.qdocinc 0 + \input doc/src/examples/multiple-demo.qdocinc */ diff --git a/examples/activeqt/opengl/doc/src/opengl.qdoc b/examples/activeqt/opengl/doc/src/opengl.qdoc index 0ae0f8f..e77fca0 100644 --- a/examples/activeqt/opengl/doc/src/opengl.qdoc +++ b/examples/activeqt/opengl/doc/src/opengl.qdoc @@ -127,5 +127,5 @@ control should be allowed (the exact browser behaviour depends on the security settings in the Internet Options dialog). - \snippet doc/src/examples/opengl-demo.qdocinc 0 + \input doc/src/examples/opengl-demo.qdocinc */ diff --git a/examples/activeqt/simple/doc/src/simple.qdoc b/examples/activeqt/simple/doc/src/simple.qdoc index 3a781ae..77a45c5 100644 --- a/examples/activeqt/simple/doc/src/simple.qdoc +++ b/examples/activeqt/simple/doc/src/simple.qdoc @@ -99,18 +99,18 @@ The simple ActiveX control is embedded using the \c <object> tag. - \snippet doc/src/examples/simple-demo.qdocinc 0 + \input doc/src/examples/simple-demo.qdocinc 0 A simple HTML button is connected to the ActiveQt's about() slot. - \snippet doc/src/examples/simple-demo.qdocinc 1 + \input doc/src/examples/simple-demo.qdocinc 1 A second ActiveX control - the standard Calendar Control - is instantiated - \snippet doc/src/examples/simple-demo.qdocinc 2 + \input doc/src/examples/simple-demo.qdocinc 2 Events from the ActiveX controls are handled using both Visual Basic Script and JavaScript. - \snippet doc/src/examples/simple-demo.qdocinc 3 + \input doc/src/examples/simple-demo.qdocinc 3 */ diff --git a/examples/activeqt/wrapper/doc/src/wrapper.qdoc b/examples/activeqt/wrapper/doc/src/wrapper.qdoc index 910cb81..ba593df 100644 --- a/examples/activeqt/wrapper/doc/src/wrapper.qdoc +++ b/examples/activeqt/wrapper/doc/src/wrapper.qdoc @@ -30,7 +30,7 @@ \title Standard Qt widgets in an HTML page - \input examples/wrapper-demo.qdocinc + \input doc/src/examples/examples/wrapper-demo.qdocinc */ /*! @@ -59,5 +59,5 @@ web browser that supports ActiveX controls, and scripting to be enabled. - \snippet examples/wrapper-demo.qdocinc 0 + \input examples/wrapper-demo.qdocinc 0 */ |