From: Caroline Chao <caroline.chao@digia.com>
Date: Mon, 25 Mar 2013 13:12:19 +0000 (+0100)
Subject: Fix warning QQuickImplicitSizeItem redefines signals
X-Git-Tag: upstream/5.2.1~812^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7ada9b9325c7adc10da6a3a4e7f887452682260;p=platform%2Fupstream%2Fqtdeclarative.git

Fix warning QQuickImplicitSizeItem redefines signals

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>
---

diff --git a/src/quick/items/qquickimplicitsizeitem.cpp b/src/quick/items/qquickimplicitsizeitem.cpp
index 3395daf..b330b39 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 54b94dd..dbb13cf 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)