Merge branch '4.7-upstream' into 4.7-doc

1 files changed, 1 insertions, 16 deletions

diff --git a/src/declarative/qml/qdeclarativenotifier_p.h b/src/declarative/qml/qdeclarativenotifier_p.h
index 0781caf..ad04ba8 100644
--- a/src/declarative/qml/qdeclarativenotifier_p.h
+++ b/src/declarative/qml/qdeclarativenotifier_p.h
@@ -75,7 +75,7 @@ public:
     inline bool isConnected(QObject *source, int sourceSignal);
     inline bool isConnected(QDeclarativeNotifier *);
 
-    inline void connect(QObject *source, int sourceSignal);
+    void connect(QObject *source, int sourceSignal);
     inline void connect(QDeclarativeNotifier *);
     inline void disconnect();
 
@@ -175,21 +175,6 @@ bool QDeclarativeNotifierEndpoint::isConnected(QDeclarativeNotifier *notifier)
     return NotifierType == type && asNotifier()->notifier == notifier;
 }
 
-void QDeclarativeNotifierEndpoint::connect(QObject *source, int sourceSignal)
-{
-    Signal *s = toSignal();
-    
-    if (s->source == source && s->sourceSignal == sourceSignal)
-        return;
-
-    disconnect();
-
-    QMetaObject::connect(source, sourceSignal, target, targetMethod);
-
-    s->source = source;
-    s->sourceSignal = sourceSignal;
-}
-
 void QDeclarativeNotifierEndpoint::connect(QDeclarativeNotifier *notifier)
 {
     Notifier *n = toNotifier();