From 99017d78ee7f357fee80ddc844a18f1d7fad4292 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 26 Apr 2017 11:47:52 +0200 Subject: qdoc: Do not exclude *_p.cpp files from source files to parse Some of the public APIs are still documented in private (_p.cpp) source files. Let qdoc parse them. Change-Id: I29ad87c21d663504f2b947d8b9ed76609c7946f3 Reviewed-by: Martin Smith --- doc/global/qt-cpp-defines.qdocconf | 1 - 1 file changed, 1 deletion(-) (limited to 'doc') diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 957bf1cc4f..c8e6463eb7 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -226,7 +226,6 @@ falsehoods += \ excludefiles += \ - "*_p.cpp" \ "*_posix.cpp" \ "*_android.cpp" \ "*_win.cpp" \ -- cgit v1.2.3 From 8e4351f6e89ae679093339f95a2a3512000e17ad Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 20 Apr 2017 14:35:20 +0200 Subject: qdoc: Ignore QT_POPCOUNT_CONSTEXPR token This enables a number of functions declared in the qalgorithms.h to be successfully documented. Change-Id: I20c5827bb8f9e2ada98fd368b7827c5b156a518e 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..31f08020e1 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -173,6 +173,7 @@ Cpp.ignoretokens += \ QT_END_NAMESPACE \ QT_FASTCALL \ QT_MUTEX_LOCK_NOEXCEPT \ + QT_POPCOUNT_CONSTEXPR \ QT_SIZEPOLICY_CONSTEXPR \ QT_WARNING_DISABLE_DEPRECATED \ QT_WARNING_PUSH \ -- cgit v1.2.3 From fe04eade5559370bdb44e1a74a0a96326265358e Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Tue, 2 May 2017 15:34:10 +0200 Subject: Doc: Highlight wearable demo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only example app that demonstrates the use of Qt for a wearable device. Change-Id: I7656f809b0219e9a2c8cd61985445ecff8b2c174 Reviewed-by: J-P Nurmi Reviewed-by: Mitch Curtis Reviewed-by: Topi Reiniö --- doc/global/manifest-meta.qdocconf | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/global/manifest-meta.qdocconf b/doc/global/manifest-meta.qdocconf index 865a457581..a7a8763c13 100644 --- a/doc/global/manifest-meta.qdocconf +++ b/doc/global/manifest-meta.qdocconf @@ -41,6 +41,7 @@ manifestmeta.highlighted.names = "QtQuick/Qt Quick Demo - Same Game" \ "QtQuickExtras/Qt Quick Extras - Flat" \ "QtQuickExtras/Qt Quick Extras - Gallery" \ "QtQuickControls2/Qt Quick Controls 2 - Gallery" \ + "QtQuickControls2/Qt Quick Controls 2 - Wearable Demo" \ "QtQuickDialogs/Qt Quick System Dialog Examples" \ "QtWinExtras/Quick Player" \ "QtMultimedia/QML Video Shader Effects Example" \ -- cgit v1.2.3