4 files changed, 3 insertions, 42 deletions
diff --git a/doc/config/qtlocation.qdocconf b/doc/config/qtlocation.qdocconf
index 90ded2a7..58bb9375 100644
--- a/doc/config/qtlocation.qdocconf
+++ b/doc/config/qtlocation.qdocconf
@@ -74,7 +74,7 @@ qhp.qtlocation.subprojects.classes.sortPages = true
 
 # Do NOT change the variables after this line unless you know what you are doing.
 
-outputdir = ../html
+outputdir = ../qtlocation
 outputformats = HTML
 
 examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml"
diff --git a/doc/config/qtlocation_doc.pri b/doc/config/qtlocation_doc.pri
deleted file mode 100644
index 3ad5868a..00000000
--- a/doc/config/qtlocation_doc.pri
+++ /dev/null
@@ -1,38 +0,0 @@
-
-win32:!win32-g++ {
-    unixstyle = false
-} else:win32-g++:isEmpty(QMAKE_SH) {
-    unixstyle = false
-} else {
-    unixstyle = true
-}
-
-QDOC = $$QT.core.bins/qdoc
-
-ONLINE_CONF = $$PWD/qtlocation.qdocconf
-DITA_CONF = $$PWD/qtlocation-dita.qdocconf
-QCH_CONF = #nothing yet
-
-$$unixstyle {
-} else {
-    QDOC = $$replace(QDOC, "qdoc", "qdoc.exe")
-    ONLINE_CONF = $$replace(ONLINE_CONF, "/", "\\")
-    DITA_DOCS = $$replace(ONLINE_CONF, "/", "\\")
-}
-
-# Build rules
-docs.depends = dita_docs online_docs qch_docs
-
-online_docs.commands = $$QDOC $$ONLINE_CONF
-
-dita_docs.commands = $$QDOC $$DITA_CONF
-
-qch_docs.commands = #no commands yet
-
-QMAKE_EXTRA_TARGETS += docs dita_docs online_docs qch_docs
-QMAKE_CLEAN += \
-               "-r $$PWD/../html" \
-               "-r $$PWD/../ditaxml"
-
-
-OTHER_FILES +=
diff --git a/qtlocation.pro b/qtlocation.pro
index 1885b81a..514a265c 100644
--- a/qtlocation.pro
+++ b/qtlocation.pro
@@ -31,6 +31,3 @@ SUBDIRS += module_qtlocation_src \
            module_qtlocation_examples \
            module_qtlocation_tests \
            module_qtlocation_doc
-
-include(doc/config/qtlocation_doc.pri)
-
diff --git a/src/location/location.pro b/src/location/location.pro
index 64a198c8..2ebbedc3 100644
--- a/src/location/location.pro
+++ b/src/location/location.pro
@@ -10,6 +10,8 @@ HEADERS += qgeopositioninfosource_p.h
 include(maps/maps.pri)
 include(places/places.pri)
 
+QMAKE_DOCS = $$PWD/../../doc/config/qtlocation.qdocconf
+
 PUBLIC_HEADERS += \
                     qgeoaddress.h \
                     qgeoareamonitor.h \