From 1b4d01d163a19bc5bc290930c879fba83d870826 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 17 Mar 2020 14:41:34 +0100 Subject: Add 'since' tag to documentation of new enum value Change-Id: I400dc1f2d3dba0fa50b2bcb5e4efbcfc0ad912fd Reviewed-by: Paul Wicking --- src/widgets/styles/qstyle.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets') diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp index 5570d59276..1066bb48c9 100644 --- a/src/widgets/styles/qstyle.cpp +++ b/src/widgets/styles/qstyle.cpp @@ -1012,7 +1012,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). -- cgit v1.2.3 From 8337684b044b944ba99c7e9a69933ea29e1194ab Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 17 Mar 2020 17:14:16 +0100 Subject: Fix docs suggesting that it's possible to draw to the X11 screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's not possible anymore, since many years. The desktop's don't use the X11 root window anymore :) Fixes: QTBUG-82880 Change-Id: I923f29f23e61d93640cacb2ac20620c5ddc480b9 Reviewed-by: Tor Arne Vestbø --- src/widgets/kernel/qapplication.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/widgets') 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 QDesktopWidget::availableGeometry(). - - On X11, it is also possible to draw on the desktop. */ QDesktopWidget *QApplication::desktop() { -- cgit v1.2.3 From 943cb0999dbbf1da99c1358b81ea3298ee116447 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 17 Mar 2020 14:34:24 +0100 Subject: Header-review: add Q_DECL_DEPRECATED_X macro to deprecated method Change-Id: I486d479b2e07042b397869aab117f44e65539f1e Reviewed-by: Lars Knoll --- src/widgets/dialogs/qwizard.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets') 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; #if QT_DEPRECATED_SINCE(5, 15) - QList visitedPages() const; + Q_DECL_DEPRECATED_X("Use visitedIds() instead") QList visitedPages() const; #endif QList visitedIds() const; QList pageIds() const; -- cgit v1.2.3