Doc: Use the module "make docs" and rename qtquick "make docs".

The qtquick "make docs" is now renamed to "make qtquick_docs" and when
you use "make docs" you get the automatic make command generated by qmake
for modularized documentation.

Change-Id: I23c0e52fa9c235f76df430f992201723ddcfbbea
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>

diff --git a/doc/config/qtdeclarative_doc.pri b/doc/config/qtdeclarative_doc.pri
index c2cf908..411e50c 100644 (file)
--- a/doc/config/qtdeclarative_doc.pri
+++ b/doc/config/qtdeclarative_doc.pri
@@ -15,11 +15,11 @@ $$unixstyle {
     DITA_DOCS = $$replace(ONLINE_CONF, "/", "\\")
 }
 
-online_docs.commands = $$QDOC $$ONLINE_CONF
-dita_docs.commands = $$QDOC $$DITA_CONF
+qtquick_online_docs.commands = $$QDOC $$ONLINE_CONF
+qtquick_dita_docs.commands = $$QDOC $$DITA_CONF
 
-docs.depends = dita_docs online_docs
-QMAKE_EXTRA_TARGETS = docs dita_docs online_docs
+qtquick_docs.depends = qtquick_dita_docs qtquick_online_docs
+QMAKE_EXTRA_TARGETS = qtquick_docs qtquick_dita_docs qtquick_online_docs
 QMAKE_CLEAN += \
                "-r $$PWD/html" \
                "-r $$PWD/ditaxml"

diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index 0af39da..f4b2a23 100644 (file)
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -23,6 +23,8 @@ exists("qqml_enable_gcov") {
 
 load(qt_module_config)
 
+QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf
+
 # private dependencies
 QT += v8-private
 

diff --git a/src/quick/quick.pro b/src/quick/quick.pro
index 7f7a0c2..e5ad858 100644 (file)
--- a/src/quick/quick.pro
+++ b/src/quick/quick.pro
@@ -19,6 +19,8 @@ exists("qqml_enable_gcov") {
 
 load(qt_module_config)
 
+QMAKE_DOCS = $$PWD/doc/qtquick.qdocconf
+
 # private dependencies
 QT += v8-private network