diff options
| -rw-r--r-- | examples/activeqt/multiple/doc/src/multiple.qdoc | 4 | ||||
| -rw-r--r-- | examples/activeqt/wrapper/doc/src/wrapper.qdoc | 4 | ||||
| -rw-r--r-- | src/activeqt/doc/activeqt.qdocconf | 4 | ||||
| -rw-r--r-- | src/activeqt/doc/src/examples/multiple-demo.qdocinc | 2 | ||||
| -rw-r--r-- | sync.profile | 2 |
5 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 607425d..79ea938 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/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..74c397e 100644 --- a/src/activeqt/doc/activeqt.qdocconf +++ b/src/activeqt/doc/activeqt.qdocconf @@ -36,9 +36,11 @@ depends += qtcore qtgui qtdoc headerdirs += .. -sourcedirs += .. +sourcedirs += .. \ + src/examples exampledirs += ../../../examples/ \ + src/examples/ \ snippets imagedirs += images diff --git a/src/activeqt/doc/src/examples/multiple-demo.qdocinc b/src/activeqt/doc/src/examples/multiple-demo.qdocinc index aabdb6d..e528667 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 diff --git a/sync.profile b/sync.profile index df14f75..ea6ff56 100644 --- a/sync.profile +++ b/sync.profile @@ -12,5 +12,5 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/release", + "qtbase" => "refs/heads/old/5.0", ); |