From 4929a38d1d6b7e7044f3b549c703f160586cdef6 Mon Sep 17 00:00:00 2001
From: Nico Vertriest <nico.vertriest@digia.com>
Date: Wed, 13 Mar 2013 13:57:26 +0100
Subject: [PATCH] Doc: several snippet issues in multiple.qdoc
- added path to qdocinc file in qtactiveqt.qdocconf
- removed unnecessary snippet label from multiple-demo.qdocinc
- modified path to qdocinc file
- removed reference to directory name,
input statement now only specifying file name multiple-demo.qdocinc
Task-number: QTBUG-29101
Change-Id: Icc957907cfcbab97a01ffec07819f667961644b8
Reviewed-by: Martin Smith <martin.smith@digia.com>
---
examples/activeqt/multiple/doc/src/multiple.qdoc | 4 ++--
src/activeqt/doc/activeqt.qdocconf | 3 ++-
src/activeqt/doc/src/examples/multiple-demo.qdocinc | 2 --
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/examples/activeqt/multiple/doc/src/multiple.qdoc b/examples/activeqt/multiple/doc/src/multiple.qdoc
index 607425d5..79ea9382 100644
--- a/examples/activeqt/multiple/doc/src/multiple.qdoc
+++ b/examples/activeqt/multiple/doc/src/multiple.qdoc
@@ -29,7 +29,7 @@
\page qaxserver-demo-multiple.html
\title Two Simple Qt Widgets
- \input examples/multiple-demo.qdocinc
+ \input multiple-demo.qdocinc
*/
/*!
@@ -66,5 +66,5 @@
WebBrowser to support ActiveX controls, and scripting to be
enabled.
- \input doc/src/examples/multiple-demo.qdocinc
+ \input multiple-demo.qdocinc
*/
diff --git a/src/activeqt/doc/activeqt.qdocconf b/src/activeqt/doc/activeqt.qdocconf
index d6dd8a8b..74c397e8 100644
--- a/src/activeqt/doc/activeqt.qdocconf
+++ b/src/activeqt/doc/activeqt.qdocconf
@@ -36,7 +36,8 @@ depends += qtcore qtgui qtdoc
headerdirs += ..
-sourcedirs += ..
+sourcedirs += .. \
+ src/examples
exampledirs += ../../../examples/ \
src/examples/ \
diff --git a/src/activeqt/doc/src/examples/multiple-demo.qdocinc b/src/activeqt/doc/src/examples/multiple-demo.qdocinc
index aabdb6dd..e5286678 100644
--- a/src/activeqt/doc/src/examples/multiple-demo.qdocinc
+++ b/src/activeqt/doc/src/examples/multiple-demo.qdocinc
@@ -1,5 +1,4 @@
\code
-//! [0]
<script language="javascript">
function setColor( form )
{
@@ -35,5 +34,4 @@ CODEBASE="http://qt.nokia.com/demos/multipleax.cab">
Line width: <input type="edit" ID="widthEdit" value = "1" />
<input type="button" value = "Set" onClick="setWidth(this.form)" />
</form>
-//! [0]
\endcode
--
GitLab