From f7ada9b9325c7adc10da6a3a4e7f887452682260 Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Mon, 25 Mar 2013 14:12:19 +0100 Subject: Fix warning QQuickImplicitSizeItem redefines signals MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-30258 Change-Id: I3ab2a3ffbe22f583ac422f876be3037c07e8255d Reviewed-by: Jan Arve Sæther Reviewed-by: Alan Alpert Reviewed-by: Caroline Chao --- src/quick/items/qquickimplicitsizeitem.cpp | 6 ++++-- src/quick/items/qquickimplicitsizeitem_p.h | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/quick/items/qquickimplicitsizeitem.cpp b/src/quick/items/qquickimplicitsizeitem.cpp index 3395dafecc..b330b3929f 100644 --- a/src/quick/items/qquickimplicitsizeitem.cpp +++ b/src/quick/items/qquickimplicitsizeitem.cpp @@ -53,7 +53,7 @@ void QQuickImplicitSizeItemPrivate::implicitWidthChanged() change.listener->itemImplicitWidthChanged(q); } } - emit q->implicitWidthChanged(); + emit q->implicitWidthChanged2(); } void QQuickImplicitSizeItemPrivate::implicitHeightChanged() @@ -65,12 +65,14 @@ void QQuickImplicitSizeItemPrivate::implicitHeightChanged() change.listener->itemImplicitHeightChanged(q); } } - emit q->implicitHeightChanged(); + emit q->implicitHeightChanged2(); } QQuickImplicitSizeItem::QQuickImplicitSizeItem(QQuickImplicitSizeItemPrivate &dd, QQuickItem *parent) : QQuickItem(dd, parent) { + connect(this, SIGNAL(implicitHeightChanged2()), this, SIGNAL(implicitHeightChanged())); + connect(this, SIGNAL(implicitWidthChanged2()), this, SIGNAL(implicitWidthChanged())); } QT_END_NAMESPACE 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) -- cgit v1.2.3