diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:43:14 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:54:05 +0100 |
| commit | 17d51411132edef53e79dcbaf1046f06f79bed5d (patch) | |
| tree | 38398d448b30313f91960c70a3a28cce91293da9 /src/widgets/kernel | |
| parent | ea0e868c4881944207e9b3a77011e05a505ff3b7 (diff) | |
| parent | 9f0dda29d5d070f63b7f098139f01f07ec91ffdf (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/platforms/windows/qwindowswindow.cpp
tests/auto/widgets/kernel/qaction/tst_qaction.cpp
Change-Id: Ia017a825ed2ca2d53ac586f4ae48df6f65818d40
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qaction.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qlayout.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp index 2813340ea2..853e27cd6e 100644 --- a/src/widgets/kernel/qaction.cpp +++ b/src/widgets/kernel/qaction.cpp @@ -1120,6 +1120,8 @@ void QAction::setData(const QVariant &data) { Q_D(QAction); + if (d->userData == data) + return; d->userData = data; d->sendDataChanged(); } diff --git a/src/widgets/kernel/qlayout.cpp b/src/widgets/kernel/qlayout.cpp index 1e455b0d64..f3db4f4e2d 100644 --- a/src/widgets/kernel/qlayout.cpp +++ b/src/widgets/kernel/qlayout.cpp @@ -1350,7 +1350,8 @@ QRect QLayout::alignmentRect(const QRect &r) const /*! Removes the widget \a widget from the layout. After this call, it is the caller's responsibility to give the widget a reasonable - geometry or to put the widget back into a layout. + geometry or to put the widget back into a layout or to explicitly + hide it if necessary. \b{Note:} The ownership of \a widget remains the same as when it was added. |