diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2017-06-01 14:52:23 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2017-06-21 13:20:36 +0000 |
| commit | 87d9baa677edd7aee5c3c6544b4fc1770f7e5ac8 (patch) | |
| tree | 9bb1a4c287a9c0b44715617f0e09f78504087d99 /src/quick/items/qquickimplicitsizeitem_p.h | |
| parent | 0148389356ca1741520f671e88266b5a7768239c (diff) | |
QQuickImplicitSizeItem: don't redefine implicit size change signals
f7ada9b9 redefined QQuickItem's implicitWidthChanged and
implicitHeightChanged signals in order to avoid warnings.
2ca187ca makes it possible to reuse the base class' signals as long as
they don't have parameters.
This change should be transparent to users.
[ChangeLog][QtQuick][Important Behavior Change] The
implicitWidthChanged2 and implicitHeightChanged2 signals of
QQuickImplicitSizeItem have been removed. Although these were
undocumented and hence private API, any applications currently using
them should use the public implicitWidthChanged and
implicitHeightChanged signals.
Task-number: QTCREATORBUG-15000
Change-Id: I35cfdefc6c992f4529b60c979265650c91ba8549
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Diffstat (limited to 'src/quick/items/qquickimplicitsizeitem_p.h')
| -rw-r--r-- | src/quick/items/qquickimplicitsizeitem_p.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/quick/items/qquickimplicitsizeitem_p.h b/src/quick/items/qquickimplicitsizeitem_p.h index 75b04449f8..8ae8f9f447 100644 --- a/src/quick/items/qquickimplicitsizeitem_p.h +++ b/src/quick/items/qquickimplicitsizeitem_p.h @@ -60,16 +60,12 @@ class QQuickImplicitSizeItemPrivate; class Q_QUICK_PRIVATE_EXPORT QQuickImplicitSizeItem : public QQuickItem { Q_OBJECT - Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged2) - Q_PROPERTY(qreal implicitHeight READ implicitHeight NOTIFY implicitHeightChanged2) + Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged) + Q_PROPERTY(qreal implicitHeight READ implicitHeight NOTIFY implicitHeightChanged) protected: QQuickImplicitSizeItem(QQuickImplicitSizeItemPrivate &dd, QQuickItem *parent); -Q_SIGNALS: - Q_REVISION(1) void implicitWidthChanged2(); - Q_REVISION(1) void implicitHeightChanged2(); - private: Q_DISABLE_COPY(QQuickImplicitSizeItem) Q_DECLARE_PRIVATE(QQuickImplicitSizeItem) |