diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2015-02-04 19:12:12 +0100 |
|---|---|---|
| committer | Milian Wolff <milian.wolff@kdab.com> | 2015-02-04 19:12:12 +0100 |
| commit | 801076803ce92d7bd646a58c792015c2b833d0c5 (patch) | |
| tree | b9bc16705a541cf402ee4614da7115135efb19d5 /src/imports/webchannel/plugin.cpp | |
| parent | 9d705911391c456813ce54a52f70aa2ccbc5b553 (diff) | |
| parent | 358e5acba3154a8ab4b53b22797c2c1eae4707dc (diff) | |
| download | qtwebchannel-801076803ce92d7bd646a58c792015c2b833d0c5.tar.gz | |
Merge branch '5.4' into dev
This merge required extensive conflict handling because
the bug fix in 5.4 to properly wrap and forward QObjects
referenced by published objects' properties clashed with
some feature additions in dev, namely the client separation
logic.
All unit test pass for me locally now again.
Conflicts:
.qmake.conf
src/webchannel/qmetaobjectpublisher.cpp
tests/auto/qml/tst_webchannel.qml
Change-Id: If3d00e13b265c6ab9fb2c38023014f97f8e7779b
Diffstat (limited to 'src/imports/webchannel/plugin.cpp')
0 files changed, 0 insertions, 0 deletions