From abbd28f551a128cc0959b8c6ba25ac6a2f821217 Mon Sep 17 00:00:00 2001 From: Paul Colby Date: Tue, 1 May 2018 23:03:35 +1000 Subject: Correct the documented visibility of some Widget methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Specifically, commit e80a3b49c0aac237104e1696fc64b3a924c89ca1 introduced the use of some QT_VERSION_CHECK macros to distinguish some methods' visibility between Qt 5 and Qt 6, however the QDoc falsehoods variable (added sometime prior) was sensitive to whitespace, and did not correctly recognize those version checks. This resulted in some methods being incorrectly documented as public instead of protected, or vice versa. This change simply makes the QT_VERSION_CHECK in QDoc falsehoods allow for optional whitespace. Methods affected by this change (in documentation only): * QListWidget::dropEvent() * QTableWidget::items(), ::indexFromItem(), itemFromIndex() * QTreeWidget::items(), ::indexFromItem(), and itemFromIndex() Task-number: QTBUG-68005 Change-Id: Ibe3e780334a9a915989ed43b5cdda6915c9161ec Reviewed-by: Luca Beldi Reviewed-by: Giuseppe D'Angelo Reviewed-by: Paul Wicking Reviewed-by: Topi Reiniö --- doc/global/qt-cpp-defines.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf index 13533555c5..a486470187 100644 --- a/doc/global/qt-cpp-defines.qdocconf +++ b/doc/global/qt-cpp-defines.qdocconf @@ -221,7 +221,7 @@ Cpp.ignoredirectives += \ # Qt 6: Remove falsehoods += \ - "QT_VERSION >= QT_VERSION_CHECK\\(6,0,0\\)" + "QT_VERSION >= QT_VERSION_CHECK\\(\\s*6\\s*,\\s*0\\s*,\\s*0\\s*\\)" excludefiles += \ -- cgit v1.2.3