diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-27 14:30:57 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-27 14:30:57 +0100 |
| commit | 9bfee2278dcf65efe94d181a135b1349019155da (patch) | |
| tree | 22e12c53acf551aa707416651277a826271137fa | |
| parent | 935fd0d0dbdc8d2d7a568c17d1871ac85df3f27b (diff) | |
| parent | b8169e058a10e44abacd3dd6f3a4432bfdf151e8 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If85c74001ef26286ece426cd5ddc32603151ff46
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | examples/activeqt/multiple/doc/src/multiple.qdoc | 4 | ||||
| -rw-r--r-- | src/activeqt/doc/activeqt.qdocconf | 3 | ||||
| -rw-r--r-- | src/activeqt/doc/src/examples/multiple-demo.qdocinc | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/.qmake.conf b/.qmake.conf index 02554ab..6aa780c 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs -MODULE_VERSION = 5.0.2 +MODULE_VERSION = 5.1.0 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/src/activeqt/doc/activeqt.qdocconf b/src/activeqt/doc/activeqt.qdocconf index d6dd8a8..74c397e 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 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 |