summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@qt.io>2020-04-02 12:17:49 +0200
committerVolker Hilsheimer <volker.hilsheimer@qt.io>2020-04-02 16:32:03 +0200
commit1de427bd4ec9d496061e733b4a849c4927d8888e (patch)
treea9e99a765d2ca59e3fa938bc49e873b171928089 /src/widgets
parentf515ca5dcd02cc7490c3113bdff739aa2b2fd77f (diff)
Use correct deprecation macro, and add \since to new member function
Change-Id: Ib9e88855c708f1fe2402d78c55ff08812d86e035 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/dialogs/qwizard.cpp4
-rw-r--r--src/widgets/dialogs/qwizard.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp
index b0f4312f40..17ea634efb 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<int> QWizard::visitedIds() const
diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h
index dc29c80f51..13b584035c 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<int> visitedPages() const;
+ QT_DEPRECATED_VERSION_X_5_15("Use visitedIds() instead") QList<int> visitedPages() const;
#endif
QList<int> visitedIds() const;
QList<int> pageIds() const;