diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:17:32 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:17:32 +0200 |
| commit | e50edc952ce15f3c11f4cdfad74ec984043cb080 (patch) | |
| tree | 060893ceb61fa700053b61db8f0d8ebed462e1c3 /src/webchannel/qwebchannel.js | |
| parent | a7c39b36c157e08fdbca6edc97950cd08d682024 (diff) | |
| parent | 86d77a900852691267f556fbde98406a12ee4310 (diff) | |
| download | qtwebchannel-e50edc952ce15f3c11f4cdfad74ec984043cb080.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
examples/webchannel/webchannel.pro
Change-Id: Ia768202d177a24ae90358b5d88621a5fa88f9002
Diffstat (limited to 'src/webchannel/qwebchannel.js')
| -rw-r--r-- | src/webchannel/qwebchannel.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/webchannel/qwebchannel.js b/src/webchannel/qwebchannel.js index 3feb829..d2c6525 100644 --- a/src/webchannel/qwebchannel.js +++ b/src/webchannel/qwebchannel.js @@ -236,8 +236,9 @@ function QObject(name, data, webChannel) object.__objectSignals__[signalIndex] = object.__objectSignals__[signalIndex] || []; object.__objectSignals__[signalIndex].push(callback); - if (!isPropertyNotifySignal) { + if (!isPropertyNotifySignal && signalName !== "destroyed") { // only required for "pure" signals, handled separately for properties in propertyUpdate + // also note that we always get notified about the destroyed signal webChannel.exec({ type: QWebChannelMessageTypes.connectToSignal, object: object.__id__, |