path: root/src/widgets
diff options
authorQt Forward Merge Bot <>2020-03-18 11:45:07 +0100
committerQt Forward Merge Bot <>2020-03-18 11:45:08 +0100
commit18b69ae8a4cf8e2e536bfe9e81bd8d929eacf115 (patch)
tree32ff58219387fa5d3417038d8aaa4fce7bc14c36 /src/widgets
parent963c47aece12a0025707c76f6f8cb3de306752b8 (diff)
parent943cb0999dbbf1da99c1358b81ea3298ee116447 (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src/widgets')
3 files changed, 2 insertions, 4 deletions
diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h
index a40635c4a5..dc29c80f51 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;
- QList<int> visitedPages() const;
+ Q_DECL_DEPRECATED_X("Use visitedIds() instead") QList<int> visitedPages() const;
QList<int> visitedIds() const;
QList<int> pageIds() const;
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index f49461b2d0..a2c2dccbcc 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -2695,8 +2695,6 @@ void QApplicationPrivate::sendSyntheticEnterLeave(QWidget *widget)
QDesktopWidget has various functions for obtaining useful geometries upon
the desktop, such as QDesktopWidget::screenGeometry() and
- On X11, it is also possible to draw on the desktop.
QDesktopWidget *QApplication::desktop()
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 69167a1fe2..70af3e295a 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -1011,7 +1011,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
\value SE_PushButtonFocusRect Area for the focus rect (usually
larger than the contents rect).
\value SE_PushButtonLayoutItem Area that counts for the parent layout.
- \value SE_PushButtonBevel Area used for the bevel of the button.
+ \value SE_PushButtonBevel [since 5.15] Area used for the bevel of the button.
\value SE_CheckBoxIndicator Area for the state indicator (e.g., check mark).
\value SE_CheckBoxContents Area for the label (text or pixmap).