Commit 8cabf8a2 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

fix shadow building of apidocs

fix $OUTDIR and actually use it

Change-Id: Ic0bf2eb98997e3f8934cc574df5b5fd109bee473
Reviewed-on: http://codereview.qt.nokia.com/287Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 603cef10
......@@ -29,13 +29,13 @@ VERSION_TAG = $$replace(QTCREATOR_VERSION, "[-.]", )
srcdir = $$cleanPath($$PWD/..)
equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys
QDOC = SRCDIR=$$srcdir OUTDIR=$$OUT_PWD/doc/html QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG $$QDOC_BIN
QDOC = SRCDIR=$$srcdir OUTDIR=$$OUT_PWD/html QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG $$QDOC_BIN
} else:win32-g++* { # just mingw
# The lack of spaces in front of the && is necessary!
QDOC = set SRCDIR=$$srcdir&& set OUTDIR=$$OUT_PWD/doc/html&& set QTC_VERSION=$$QTCREATOR_VERSION&& set QTC_VERSION_TAG=$$VERSION_TAG&& $$QDOC_BIN
QDOC = set SRCDIR=$$srcdir&& set OUTDIR=$$OUT_PWD/html&& set QTC_VERSION=$$QTCREATOR_VERSION&& set QTC_VERSION_TAG=$$VERSION_TAG&& $$QDOC_BIN
} else { # nmake
QDOC = set SRCDIR=$$srcdir $$escape_expand(\\n\\t) \
set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\\n\\t) \
set OUTDIR=$$OUT_PWD/html $$escape_expand(\\n\\t) \
set QTC_VERSION=$$QTCREATOR_VERSION $$escape_expand(\\n\\t) \
set QTC_VERSION_TAG=$$VERSION_TAG $$escape_expand(\\n\\t) \
$$QDOC_BIN
......
......@@ -40,7 +40,7 @@ headers.fileextensions = "*.h"
sources.fileextensions = "*.cpp *.qdoc"
imagedirs = $SRCDIR/images $SRCDIR/templates/images
outputdir = ../api/html
outputdir = $OUTDIR
exampledirs = ../api/examples
indexes = qt.index
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment