summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2013-02-04 15:12:17 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-05 14:02:12 +0100
commitc5714c2eaa912b6928d9edb07aeceba62b9f1ec8 (patch)
tree12b32cf2e20e8037a02c37efd985742f42a42cb8
parent7f394bc7c4c61289885101f4d349a0bf573ac11d (diff)
Doc: snippet issues with wrapper-demo
Adapted qdocconf + qdoc file to new folder structure Task-number: QTBUG-29101 Change-Id: Ifd8e379915bf0bf612e9211b93cc53636d156f94 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
-rw-r--r--examples/activeqt/wrapper/doc/src/wrapper.qdoc4
-rw-r--r--src/activeqt/doc/activeqt.qdocconf1
2 files changed, 3 insertions, 2 deletions
diff --git a/examples/activeqt/wrapper/doc/src/wrapper.qdoc b/examples/activeqt/wrapper/doc/src/wrapper.qdoc
index ba593df..41debb9 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 doc/src/examples/examples/wrapper-demo.qdocinc
+ \input doc/src/examples/wrapper-demo.qdocinc
*/
/*!
@@ -59,5 +59,5 @@
web browser that supports ActiveX controls, and scripting to be
enabled.
- \input examples/wrapper-demo.qdocinc 0
+ \input doc/src/examples/wrapper-demo.qdocinc
*/
diff --git a/src/activeqt/doc/activeqt.qdocconf b/src/activeqt/doc/activeqt.qdocconf
index 2001b1f..d6dd8a8 100644
--- a/src/activeqt/doc/activeqt.qdocconf
+++ b/src/activeqt/doc/activeqt.qdocconf
@@ -39,6 +39,7 @@ headerdirs += ..
sourcedirs += ..
exampledirs += ../../../examples/ \
+ src/examples/ \
snippets
imagedirs += images