From ce9dc06b4c120ce6c32eeea71bc2c62dff32b047 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 27 Apr 2017 14:05:23 +0200 Subject: qdoc: Reintroduce Q_OS_* defines into the global documentation config This was dropped by commit 740ff1b8 in preparation for clang-based C++ parser in qdoc. However, the old (current) parser still needs it, as some of the functions to document are wrapped with those macros. It does not interfere with the clang parser anyway; unlike the old parser, clang will not resolve the wildcards in macros. Change-Id: I3135a263e8eb200a11b1e918c776e3a2c3ec5fb6 Reviewed-by: Martin Smith --- doc/global/qt-cpp-defines.qdocconf | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index c8e6463eb7..df25d15448 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -14,6 +14,7 @@ defines += Q_QDOC \ QT_DEPRECATED_* \ Q_NO_USING_KEYWORD \ __cplusplus \ + Q_OS_.* \ Q_STDLIB_UNICODE_STRINGS \ Q_COMPILER_INITIALIZER_LISTS \ Q_COMPILER_UNICODE_STRINGS \ -- cgit v1.2.3 From c745b8ecd464fe216d8e1f94bac426cfc89f233e Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 12 May 2017 11:19:41 +0200 Subject: Doc: Add highlighting for a number of examples - Qt Bluetooth: Bluetooth Low Energy Heart Rate Game - Qt Charts: Chart Themes Example - Qt Data Visualization: Bars Example - Qt Data Visualization: Surface Example Task-number: QTBUG-53728 Change-Id: I960532deedc7e24dc5cd3e452ab1908b367e6d8e Reviewed-by: Leena Miettinen Reviewed-by: Venugopal Shivashankar --- doc/global/manifest-meta.qdocconf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index a7a8763c13..4ef14d3486 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -46,7 +46,11 @@ manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \ "QtWinExtras/Quick Player" \ "QtMultimedia/QML Video Shader Effects Example" \ "QtCanvas3D/Interactive Mobile Phone Example" \ - "QtLocation/Map Viewer (QML)" + "QtLocation/Map Viewer (QML)" \ + "QtBluetooth/Bluetooth Low Energy Heart Rate Game" \ + "QtCharts/Chart Themes Example" \ + "QtDataVisualization/Bars Example" \ + "QtDataVisualization/Surface Example" manifestmeta.highlighted.attributes = isHighlighted:true -- cgit v1.2.3