Use QMAKE_DOCS

Change-Id: I565956b9e2ae59a0f30ac1672570078beaa708ba
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

diff --git a/doc/doc.pri b/doc/doc.pri
deleted file mode 100644 (file)
index 459e9ba..0000000
--- a/doc/doc.pri
+++ /dev/null
@@ -1,14 +0,0 @@
-OTHER_FILES += \
-                $$PWD/qt5.qdocconf \
-                $$PWD/qt5-dita.qdocconf
-
-docs_target.target = docs
-docs_target.commands = qdoc3 $$PWD/qt5.qdocconf
-
-ditadocs_target.target = ditadocs
-ditadocs_target.commands = qdoc3 $$PWD/qt5-dita.qdocconf
-
-QMAKE_EXTRA_TARGETS = docs_target ditadocs_target
-QMAKE_CLEAN += \
-               "-r $$PWD/html" \
-               "-r $$PWD/ditaxml"

diff --git a/qtxmlpatterns.pro b/qtxmlpatterns.pro
index afc3680..58c33f2 100644 (file)
--- a/qtxmlpatterns.pro
+++ b/qtxmlpatterns.pro
@@ -1,3 +1 @@
 load(qt_parts)
-
-include (doc/doc.pri)

diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro
index 1d0a75f..fa57066 100644 (file)
--- a/src/xmlpatterns/xmlpatterns.pro
+++ b/src/xmlpatterns/xmlpatterns.pro
@@ -9,6 +9,8 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
 
 load(qt_module)
 
+QMAKE_DOCS = $$PWD/../../doc/qt5.qdocconf
+
 include($$PWD/common.pri)
 include($$PWD/acceltree/acceltree.pri)
 include($$PWD/api/api.pri)