From 1de427bd4ec9d496061e733b4a849c4927d8888e Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 2 Apr 2020 12:17:49 +0200 Subject: [PATCH] Use correct deprecation macro, and add \since to new member function Change-Id: Ib9e88855c708f1fe2402d78c55ff08812d86e035 Reviewed-by: Paul Wicking --- src/widgets/dialogs/qwizard.cpp | 4 ++-- src/widgets/dialogs/qwizard.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index b0f4312f401..17ea634efb7 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -2377,11 +2377,11 @@ bool QWizard::hasVisitedPage(int theid) const } /*! + \since 5.15 + Returns the list of IDs of visited pages, in the order in which the pages were visited. - Pressing \uicontrol Back marks the current page as "unvisited" again. - \sa hasVisitedPage() */ QList QWizard::visitedIds() const diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index dc29c80f513..13b584035c8 100644 --- a/src/widgets/dialogs/qwizard.h +++ b/src/widgets/dialogs/qwizard.h @@ -129,7 +129,7 @@ public: QWizardPage *page(int id) const; bool hasVisitedPage(int id) const; #if QT_DEPRECATED_SINCE(5, 15) - Q_DECL_DEPRECATED_X("Use visitedIds() instead") QList visitedPages() const; + QT_DEPRECATED_VERSION_X_5_15("Use visitedIds() instead") QList visitedPages() const; #endif QList visitedIds() const; QList pageIds() const;