summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@digia.com>2013-06-25 10:53:33 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-26 12:50:37 +0200
commit0ae1148484b66dfea6667170b3b176f970d7e93f (patch)
tree21ec03d2680160334db5378f817de2c0af5dd0cc /doc
parentaf7c0af561bcefe64892aecaecaf1690e7b24704 (diff)
Properly parse the new namespace macros for Bluetooth and NFC libs
Task-number: QTBUG-31851 Change-Id: I4c0eb3cf69ae10246a22f93e76a09d3a72c2196c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alex <alexander.blasche@digia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/global/qt-cpp-defines.qdocconf10
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf
index b2160ea4ac..e65baf6c5f 100644
--- a/doc/global/qt-cpp-defines.qdocconf
+++ b/doc/global/qt-cpp-defines.qdocconf
@@ -102,10 +102,12 @@ Cpp.ignoretokens += \
QT_END_NAMESPACE \
QT_FASTCALL \
QT_WIDGET_PLUGIN_EXPORT \
- QTBLUETOOTH_BEGIN_NAMESPACE \
- QTBLUETOOTH_END_NAMESAPCE \
- QTNFC_BEGIN_NAMESPACE \
- QTNFC_END_NAMESPACE \
+ QT_BEGIN_NAMESPACE_NFC \
+ QT_END_NAMESPACE_NFC \
+ QT_USE_NAMESPACE_NFC \
+ QT_BEGIN_NAMESPACE_BLUETOOTH \
+ QT_END_NAMESPACE_BLUETOOTH \
+ QT_USE_NAMESPACE_BLUETOOTH \
QWEBKIT_EXPORT
Cpp.ignoredirectives += \