diff options
| author | Caroline Chao <caroline.chao@digia.com> | 2013-03-25 14:12:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-27 08:23:16 +0100 |
| commit | f7ada9b9325c7adc10da6a3a4e7f887452682260 (patch) | |
| tree | 93b8188eebff1eb148a6e520522082008d66af6d /src/quick/items/qquickimplicitsizeitem_p.h | |
| parent | 363385a549f33b2b0a34ac9cc8149376f456655c (diff) | |
Fix warning QQuickImplicitSizeItem redefines signalsv5.1.0-alpha1
Task-number: QTBUG-30258
Change-Id: I3ab2a3ffbe22f583ac422f876be3037c07e8255d
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'src/quick/items/qquickimplicitsizeitem_p.h')
| -rw-r--r-- | src/quick/items/qquickimplicitsizeitem_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/quick/items/qquickimplicitsizeitem_p.h b/src/quick/items/qquickimplicitsizeitem_p.h index 54b94dd183..dbb13cf080 100644 --- a/src/quick/items/qquickimplicitsizeitem_p.h +++ b/src/quick/items/qquickimplicitsizeitem_p.h @@ -51,15 +51,15 @@ class QQuickImplicitSizeItemPrivate; class Q_QUICK_PRIVATE_EXPORT QQuickImplicitSizeItem : public QQuickItem { Q_OBJECT - Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged) - Q_PROPERTY(qreal implicitHeight READ implicitHeight NOTIFY implicitHeightChanged) + Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged2) + Q_PROPERTY(qreal implicitHeight READ implicitHeight NOTIFY implicitHeightChanged2) protected: QQuickImplicitSizeItem(QQuickImplicitSizeItemPrivate &dd, QQuickItem *parent); Q_SIGNALS: - void implicitWidthChanged(); - void implicitHeightChanged(); + void implicitWidthChanged2(); + void implicitHeightChanged2(); private: Q_DISABLE_COPY(QQuickImplicitSizeItem) |