summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-18 03:03:16 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-18 03:03:16 +0100
commit00fe7a58b9b4ffe6caa7c3e14d5af40c824c0a80 (patch)
tree53450278a68d807a3c58b43fa2f2ba3fefbc41c1
parent067f188d321fb65c8291654ee692ea813ef2fc18 (diff)
parent0d5ce87e1aeaed361c8d034e8329c0ceca62e42a (diff)
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1
-rw-r--r--src/winextras/qwinfunctions.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp
index b237a50..4dcf8f0 100644
--- a/src/winextras/qwinfunctions.cpp
+++ b/src/winextras/qwinfunctions.cpp
@@ -1664,8 +1664,8 @@ void qt_ExtendFrameIntoClientArea(QWindow *window, int left, int top, int right,
If you want the extended frame to act like a standard window border, you
should handle that yourself.
- \note If \a window is a QWidget handle, set the
- Qt::WA_NoSystemBackground attribute for your widget.
+ \note Qt::WA_NoSystemBackground must not be set on widgets for
+ extendFrameIntoClientArea() to work.
\sa resetExtendedFrame()
*/
@@ -1709,7 +1709,7 @@ void QtWin::extendFrameIntoClientArea(QWindow *window, const QMargins &margins)
This convenience function calls extendFrameIntoClientArea() with margins set
to 0.
- \note You must unset the Qt::WA_NoSystemBackground attribute for
+ \note Qt::WA_NoSystemBackground must not be set on widgets for
extendFrameIntoClientArea() to work.
\sa extendFrameIntoClientArea()