2 files changed, 8 insertions, 10 deletions
diff --git a/src/tools/qdoc/doc/config/qdoc-project.qdocconf b/src/tools/qdoc/doc/config/qdoc-project.qdocconf
index 2ac9107f38..d48e132335 100644
--- a/src/tools/qdoc/doc/config/qdoc-project.qdocconf
+++ b/src/tools/qdoc/doc/config/qdoc-project.qdocconf
@@ -3,15 +3,13 @@ include(macros.qdocconf)
 include(qt-cpp-ignore.qdocconf)
 include(qt-defines.qdocconf)
 
-indexes = $$MODULE_BUILD_TREE/doc/html/qt.index
-
 sourceencoding = UTF-8
 outputencoding = UTF-8
 naturallanguage = en_US
 
 project          = QDoc
-description      = QDoc3 Manual
-url = http://doc.qt.nokia.com/qdoc
+description      = QDoc Manual
+url = http://doc-snapshot.qt-project.org/qdoc
 
 sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
 headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx"
@@ -28,8 +26,8 @@ exampledirs = .. \
 imagedirs = ../../../doc/src/templates/images \
             images
 
-outputdir = $$MODULE_BUILD_TREE/tools/qdoc/doc/html
-tagfile = $$MODULE_BUILD_TREE/tools/qdoc/doc/html/qdoc.tags
+outputdir = ../html
+tagfile = ../html/qdoc.tags
 
 qhp.projects            = QDoc
 
diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
index 9a4796cebe..abd256c60d 100644
--- a/src/tools/qdoc/qdoc.pro
+++ b/src/tools/qdoc/qdoc.pro
@@ -104,11 +104,11 @@ equals(QMAKE_DIR_SEP, /) {
     QDOC = $$replace(QDOC, "/", "\\")
 }
 
-html-docs.commands = cd \"$$QT_BUILD_TREE/doc\" && $$QDOC $$QT_SOURCE_TREE/tools/qdoc/doc/config/qdoc.qdocconf
-html-docs.files = $$QT_BUILD_TREE/doc/html
+html-docs.commands = $$QDOC $$PWD/doc/config/qdoc.qdocconf
+html-docs.files = $$PWD/doc/html
 
-qch-docs.commands = cd \"$$QT_BUILD_TREE/doc\" && $$QHELPGENERATOR $$QT_BUILD_TREE/tools/qdoc/doc/html/qdoc.qhp -o $$QT_BUILD_TREE/tools/qdoc/doc/qch/qdoc.qch
-qch-docs.files = $$QT_BUILD_TREE/tools/qdoc/doc/qch
+qch-docs.commands = $$QHELPGENERATOR $$PWD/doc/html/qdoc.qhp -o $$PWD/doc/qch/qdoc.qch
+qch-docs.files = $$PWD/doc/qch
 qch-docs.path = $$[QT_INSTALL_DOCS]
 qch-docs.CONFIG += no_check_exist directory