diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-24 11:34:24 +0100 |
| commit | db8572ea4b2384611c37dd61956377828fe84202 (patch) | |
| tree | bdb0c6fd2b8b8d14897b34ee9c55cc83eef2ef7a /src/remoteobjects/qremoteobjectnode_p.h | |
| parent | 930c4eafe591c7848163cbff4f72020f4a77d579 (diff) | |
| parent | e6eb6ab12daf76f3e716c0d51ceecdab61e39e48 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/remoteobjects/qremoteobjectabstractitemmodeladapter_p.h
src/remoteobjects/qremoteobjectdynamicreplica.cpp
src/remoteobjects/qremoteobjectnode_p.h
src/remoteobjects/qremoteobjectregistry.cpp
tests/auto/auto.pro
tools/repc/repcodegenerator.cpp
Done-with: BogDan Vatra <bogdan@kdab.com>
Change-Id: I9d0230736b768eac44b06376aeaab1b0b09eb22a
Diffstat (limited to 'src/remoteobjects/qremoteobjectnode_p.h')
| -rw-r--r-- | src/remoteobjects/qremoteobjectnode_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/remoteobjects/qremoteobjectnode_p.h b/src/remoteobjects/qremoteobjectnode_p.h index 27e84ec..b44ccc5 100644 --- a/src/remoteobjects/qremoteobjectnode_p.h +++ b/src/remoteobjects/qremoteobjectnode_p.h @@ -136,6 +136,7 @@ public: QVariantList rxArgs; QVariant rxValue; QRemoteObjectAbstractPersistedStore *persistedStore; + bool m_handshakeReceived = false; Q_DECLARE_PUBLIC(QRemoteObjectNode) }; |