diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-11-18 09:12:39 +1000 |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-11-18 09:12:39 +1000 |
| commit | f11bd27aa26b5effbfba47e0aebc49f45405d470 (patch) | |
| tree | 68f7473abff5073e274630d090fc065d5933d590 | |
| parent | af723d7ca0902618dc6da1509b79a815d96e9382 (diff) | |
Add necessary flags for latest version of qdoc3
| -rw-r--r-- | doc/doc.pri | 4 | ||||
| -rwxr-xr-x | doc/src/mkdocs | 14 |
2 files changed, 2 insertions, 16 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index eb2a2d7..48c7d7f 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -19,14 +19,14 @@ $$unixstyle { } else { QDOC = qdoc3 } - docs.commands = (TOPSRC=$$TOPSRC DESTDIR=$$DESTDIR $$QDOC $$QDOCCONF_FILE) + docs.commands = (TOPSRC=$$TOPSRC DESTDIR=$$DESTDIR $$QDOC -online $$QDOCCONF_FILE) } else { exists($$[QT_INSTALL_BINS]\\qdoc3.exe) { QDOC = $$[QT_INSTALL_BINS]\\qdoc3 } else { QDOC = qdoc3 } - docs.commands = (set TOPSRC=$$TOPSRC&set DESTDIR=$$DESTDIR&$$QDOC $$QDOCCONF_FILE) + docs.commands = (set TOPSRC=$$TOPSRC&set DESTDIR=$$DESTDIR&$$QDOC -online $$QDOCCONF_FILE) } QMAKE_EXTRA_TARGETS += docs diff --git a/doc/src/mkdocs b/doc/src/mkdocs deleted file mode 100755 index a344355..0000000 --- a/doc/src/mkdocs +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -SCRIPTDIR=`dirname $0` -if ! test -f "$SCRIPTDIR/qtopencl.qdocconf" ; then - echo "$0: cannot locate qtopencl.qdocconf to generate documentation" 1>&2 - exit 1 -fi -case "$SCRIPTDIR" in - /*) ;; - *) SCRIPTDIR=`pwd`/"$SCRIPTDIR" ;; -esac -export TOPSRC="$SCRIPTDIR/../.." -export DESTDIR="$SCRIPTDIR/../html" -mkdir -p "$DESTDIR" -exec qdoc3 "$SCRIPTDIR/qtopencl.qdocconf" |