summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLincoln Ramsay <lincoln.ramsay@nokia.com>2012-03-30 16:43:28 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-02 09:12:31 +0200
commit066ada449d1761a60cd469e6010d232a18ffdeb3 (patch)
tree7b80433f3df9dad05f90adc69e9f993b8a785d95
parent6c06a5536ad4dfe72423915c9bf99cd25a6c9b93 (diff)
Docs go in the build tree, not the source tree!
Change-Id: I2d489c0ea78019e7b5ce5ea52868119baddffbd6 Reviewed-by: Peter Yard <peter.yard@nokia.com> Reviewed-by: Alex <alex.blasche@nokia.com>
-rw-r--r--doc/config/qtsensors.qdocconf2
-rw-r--r--doc/config/qtsensors_doc.pri4
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/config/qtsensors.qdocconf b/doc/config/qtsensors.qdocconf
index 7253835c..9499335d 100644
--- a/doc/config/qtsensors.qdocconf
+++ b/doc/config/qtsensors.qdocconf
@@ -70,7 +70,7 @@ qhp.qtsensors.subprojects.classes.sortPages = true
# Do NOT change the variables after this line unless you know what you are doing.
-outputdir = ../html
+outputdir = $PWD/doc/html
outputformats = HTML
examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml"
diff --git a/doc/config/qtsensors_doc.pri b/doc/config/qtsensors_doc.pri
index d0c92ce0..4c91758b 100644
--- a/doc/config/qtsensors_doc.pri
+++ b/doc/config/qtsensors_doc.pri
@@ -31,8 +31,8 @@ qch_docs.commands = #no commands yet
QMAKE_EXTRA_TARGETS += docs dita_docs online_docs qch_docs
QMAKE_CLEAN += \
- "-r $$PWD/../html" \
- "-r $$PWD/../ditaxml"
+ "-r $$OUT_PWD/../html" \
+ "-r $$OUT_PWD/../ditaxml"
OTHER_FILES += \