Add plumbing for more advanced signal property control

1 files changed, 2 insertions, 5 deletions

diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp
index 6dca2d1..c77d0f6 100644
--- a/src/declarative/util/qmlconnection.cpp
+++ b/src/declarative/util/qmlconnection.cpp
@@ -187,10 +187,7 @@ void QmlConnection::connectIfValid()
             return;
         }
 
-        if (sigparams.isEmpty())
-            d->boundsignal = new QmlBoundSignal(qmlContext(this), d->script, sender, sigIdx, this);
-        else
-            d->boundsignal = new QmlBoundSignalProxy(new QmlContext(qmlContext(this),this), d->script, sender, sigIdx, this);
+        d->boundsignal = new QmlBoundSignal(qmlContext(this), d->script, sender, mo->method(sigIdx), this);
     }
 }
 
@@ -238,7 +235,7 @@ void QmlConnection::setScript(const QString& script)
         } else {
             // must exist - update
             d->script = script;
-            d->boundsignal->setExpression(script);
+            d->boundsignal->expression()->setExpression(script);
         }
     } else {
         d->script = script;