diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:01:05 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 11:01:05 +0100 |
| commit | 196097bfc84d297199ea591fc19e714c88796e8e (patch) | |
| tree | 44db9b8047021f358a009b1d8662e69711f6b969 /src/webchannel/signalhandler_p.h | |
| parent | 1cbc05a6568db5e0ff094f8e09723c607ade88af (diff) | |
| parent | 87d83df5f3fa2a582385e70dc22c4a9789134f99 (diff) | |
| download | qtwebchannel-196097bfc84d297199ea591fc19e714c88796e8e.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I601a28bfd7eb92d894295d7b7848b4a80dcc1d5d
Diffstat (limited to 'src/webchannel/signalhandler_p.h')
| -rw-r--r-- | src/webchannel/signalhandler_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webchannel/signalhandler_p.h b/src/webchannel/signalhandler_p.h index b6c316b..9bcb071 100644 --- a/src/webchannel/signalhandler_p.h +++ b/src/webchannel/signalhandler_p.h @@ -184,7 +184,7 @@ void SignalHandler<Receiver>::connectTo(const QObject *object, const int signalI } // otherwise not yet connected, do so now static const int memberOffset = QObject::staticMetaObject.methodCount(); - QMetaObject::Connection connection = QMetaObject::connect(object, signal.methodIndex(), this, memberOffset + signalIndex, Qt::DirectConnection, 0); + QMetaObject::Connection connection = QMetaObject::connect(object, signal.methodIndex(), this, memberOffset + signalIndex, Qt::AutoConnection, 0); if (!connection) { qWarning() << "SignalHandler: QMetaObject::connect returned false. Unable to connect to" << object << signal.name() << signal.methodSignature(); return; |