diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-04 03:03:30 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-04 03:03:30 +0200 |
| commit | c145a7f02cd89065e5648f6f7c5e0ac79022e56c (patch) | |
| tree | f08a7108255ed116b1b134ff0cfe5a988700064b | |
| parent | 3442f4a70f155aa4944de85acb6689c84b012727 (diff) | |
| parent | d5310efd2fbbe9786a4257f3ada78381cb54da23 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I23708710d36138da8b3eb67619cb456015639050
| -rw-r--r-- | dist/changes-5.14.1 | 20 | ||||
| -rw-r--r-- | src/winextras/qwinfunctions.cpp | 6 |
2 files changed, 23 insertions, 3 deletions
diff --git a/dist/changes-5.14.1 b/dist/changes-5.14.1 new file mode 100644 index 0000000..d008638 --- /dev/null +++ b/dist/changes-5.14.1 @@ -0,0 +1,20 @@ +Qt 5.14.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.14.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. 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() |