summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2012-10-11 16:13:00 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-12 02:52:55 +0200
commita797a46d6be430ec862e1bf440597f9b6fdbb5e2 (patch)
tree1917e24a06527898f28a0378fd02ad62eaef59e0 /src
parent2d1ca84742d6a3e785eed0890d66840f1187bd27 (diff)
Update docs after modularization of docs
The global files now live in qtbase only, and are made available to the other modules via the $QT_INSTALL_DOCS variable. Change-Id: I776e3168e41e6ae2fe1ee3c3f0097482466bcb62 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/publishsubscribe/publishsubscribe.pro4
-rw-r--r--src/serviceframework/serviceframework.pro4
-rw-r--r--src/systeminfo/systeminfo.pro4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/publishsubscribe/publishsubscribe.pro b/src/publishsubscribe/publishsubscribe.pro
index 9032ea0d..bec26f3e 100644
--- a/src/publishsubscribe/publishsubscribe.pro
+++ b/src/publishsubscribe/publishsubscribe.pro
@@ -54,7 +54,7 @@ win32: {
HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
+QMAKE_DOCS = $$PWD/../../doc/config/publishsubscribe/qtpublishsubscribe.qdocconf
+
load(qt_module)
-# Enable doc submodule doc builds
-include (../../doc/config/publishsubscribe/qtpublishsubscribe_doc.pri) \ No newline at end of file
diff --git a/src/serviceframework/serviceframework.pro b/src/serviceframework/serviceframework.pro
index 7ce4098a..b0a3ef16 100644
--- a/src/serviceframework/serviceframework.pro
+++ b/src/serviceframework/serviceframework.pro
@@ -56,7 +56,7 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS \
qservicereply_p.h \
qservicerequest_p.h
+QMAKE_DOCS = $$PWD/../../doc/config/serviceframework/qtserviceframework.qdocconf
+
load(qt_module)
-# Enable doc submodule doc builds
-include (../../doc/config/serviceframework/qtserviceframework_doc.pri) \ No newline at end of file
diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro
index 07919ad2..70a36c3d 100644
--- a/src/systeminfo/systeminfo.pro
+++ b/src/systeminfo/systeminfo.pro
@@ -260,6 +260,8 @@ simulator {
}
}
+QMAKE_DOCS = $$PWD/../../doc/config/systeminfo/qtsysteminfo.qdocconf
+
HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
load(qt_module)
@@ -277,6 +279,4 @@ config_bluez {
}
}
-# Enable doc submodule doc builds
-include (../../doc/config/systeminfo/qtsysteminfo_doc.pri)