summaryrefslogtreecommitdiffstats
path: root/doc/qt5.qdocconf
diff options
context:
space:
mode:
authoralex <alex.blasche@nokia.com>2012-02-27 16:53:44 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-01 10:06:15 +0100
commit0ff02efefc6b47112f8db2959baa125d546ec63a (patch)
tree93bd7c371b64451f58ef3d091744093484f6ae5c /doc/qt5.qdocconf
parent86f234ad2de4b25eb394739ecf672132904496e2 (diff)
Remove/disable QtNFC from Qt 5.0.
Currently there is no way of verifying the QtNFC API. This decision will be revisited by future Qt releases. Furthermore there will be no commitment that the re-enabled QtNFC API will be source or binary compatible to the version disabled by this commit. Change-Id: I9aea986189d48b5c2368ce6b2c7ff20e2c94f2f8 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Michael Zanetti <michael.zanetti@nokia.com> Reviewed-by: Oliver Woltermann <oliver.woltermann@nokia.com>
Diffstat (limited to 'doc/qt5.qdocconf')
-rw-r--r--doc/qt5.qdocconf12
1 files changed, 7 insertions, 5 deletions
diff --git a/doc/qt5.qdocconf b/doc/qt5.qdocconf
index 138a7948..4d47b68c 100644
--- a/doc/qt5.qdocconf
+++ b/doc/qt5.qdocconf
@@ -12,11 +12,13 @@ include(macros.qdocconf)
# Images should be placed in <rootdir>/dic/images and examples in
# <rootdir>/examples.
# Paths are relative to the location of this file.
-exampledirs += ../examples/ ../demos/
-headerdirs += ..
-imagedirs += src/images
-sourcedirs += ..
-excludedirs += ../tests
+exampledirs += ../examples
+headerdirs += ../src/bluetooth ../src/imports/bluetooth
+imagedirs += src/images
+sourcedirs += ../src/bluetooth \
+ ../src/imports/bluetooth \
+ src
+excludedirs += ../tests
# The following parameters are for creating a qhp file, the qhelpgenerator
# program can convert the qhp file into a qch file which can be opened in