aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Kampas <martin.kampas@jolla.com>2016-10-11 10:52:18 +0200
committerJuergen Bocklage-Ryannel <juergen.bocklage-ryannel@pelagicore.com>2016-11-22 14:03:45 +0000
commit541f7f6874ee4c9c415fa7086ed28093d4b2b264 (patch)
treee0a560d8a2942ec3e99bf0fb69fd62f28e47afa8
parent89d17e1ddfaf1d57c3d1d797c1550776c5d728c8 (diff)
Update docs on building docs
Required after f2028f7710b7dd59b4d752a703ac988e5ce529b4 (Doc: Convert doc config to use standard Qt module make targets) See also http://lists.qt-project.org/pipermail/automotive/2016-October/000092.html Change-Id: I4df20efff3b020aee52a1f0400193fba0f92e286 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r--INSTALL.md4
-rw-r--r--doc/installation.qdoc4
2 files changed, 4 insertions, 4 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 225188b..9eb4fe7 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -25,9 +25,9 @@ target.
## Build documentation
- $ export QT_INSTALL_DOCS=$QTSRC/qtbase/doc
+ $ qmake CONFIG+=force_independent
$ make docs
-The documentation will be avilable at 'doc/html/index.html'.
+The documentation will be avilable at 'doc/qmllive/index.html'.
Copyright (C) 2016 Pelagicore AG
diff --git a/doc/installation.qdoc b/doc/installation.qdoc
index a6a2b10..d373d45 100644
--- a/doc/installation.qdoc
+++ b/doc/installation.qdoc
@@ -81,11 +81,11 @@ Optionally it can be packaged with the help of
\chapter Building documentation
\code
- $ export QT_INSTALL_DOCS=$QTSRC/qtbase/doc
+ $ qmake CONFIG+=force_independent
$ make docs
\endcode
-The documentation will be available at \tt{doc/html/index.html}.
+The documentation will be available at \tt{doc/qmllive/index.html}.
\chapter Build options reference