Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I14b1bf27e79f760bad399e1e5a39cc05d774eabd

Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I14b1bf27e79f760bad399e1e5a39cc05d774eabd
4d789c38 · Frederik Gladhorn · 27cbc14b · c5714c2e · 4d789c38 · 4d789c38
Commit 4d789c38 authored 12 years ago by Frederik Gladhorn
--- 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
 */
--- 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