diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-08 17:19:14 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-10 23:27:03 +0200 |
commit | 087efb572ace9cbb864c1aab7357916cb7b0428b (patch) | |
tree | 4896cf5091cff4c40291d23c94b2a1cf445338f2 /configure | |
parent | 9adf7fb708963c7bb27dc1fd54aa879395f6cf57 (diff) |
Modularize documenation build
qdocconf files can now reference $QT_INSTALL_DOCS to pick up e.g. global
includes, instead of using relative paths. Qt modules will automatically
get a doc target that builds and installs into the right place (including
supporting shadow-builds) if they set QMAKE_DOCS before loading(qt_module).
Change-Id: Ia408385199e56e3ead0afa45645a059d1a8b0d48
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2254,9 +2254,9 @@ if [ "$OPT_SHADOW" = "yes" ]; then mv "$outpath/mkspecs-modules-inst" "$outpath/mkspecs/modules-inst" fi - # symlink the doc directory - rm -rf "$outpath/doc" - ln -s "$relpath/doc" "$outpath/doc" + # Prepare doc directory + mkdir -p "$outpath/doc" + ln -s "$relpath"/doc/global "$outpath/doc" fi # symlink fonts to be able to run application from build directory |