diff options
| author | Lars Knoll <[email protected]> | 2020-02-28 08:40:53 +0100 |
|---|---|---|
| committer | Lars Knoll <[email protected]> | 2020-02-28 09:48:30 +0100 |
| commit | a450cce6b670dbcac84fcc4a66fc632b31ce8414 (patch) | |
| tree | 35b77fa22c4def97b619bd3a87f6d394e452bb2e /src/widgets/dialogs/qwizard.cpp | |
| parent | f6f6eab89f57fb0db8f623f4a92a7b9c4ba6e9ea (diff) | |
| parent | 4c86e667d220e27bb4b6e370675ffb2872e8521c (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I469b0501cc65fc5ce4d797a69ae89405cc69c7f8
Diffstat (limited to 'src/widgets/dialogs/qwizard.cpp')
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 31e32bb9313..b0f4312f401 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -2384,13 +2384,23 @@ bool QWizard::hasVisitedPage(int theid) const \sa hasVisitedPage() */ -QList<int> QWizard::visitedPages() const +QList<int> QWizard::visitedIds() const { Q_D(const QWizard); return d->history; } /*! + \obsolete Use visitedIds() instead +*/ +#if QT_DEPRECATED_SINCE(5, 15) +QList<int> QWizard::visitedPages() const +{ + return visitedIds(); +} +#endif + +/*! Returns the list of page IDs. \since 4.5 */ |