diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2014-01-08 17:59:55 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-09 13:35:45 +0100 |
| commit | 3ae3b765fcc650d34c5f777e39b2302b77896d04 (patch) | |
| tree | 98e0b7bc2845a6710d643ede1ea1fde7ff671ab8 /src/webchannel/webchannel.pro | |
| parent | 4117c5b8ea09d1ed872927edb31a63868c3f43e2 (diff) | |
| download | qtwebchannel-3ae3b765fcc650d34c5f777e39b2302b77896d04.tar.gz | |
Fix regression in handling of var-emitting signals from QML.
Qt 5.3 propagates var-arguments of signals as QJSValue instead of as a
QVariant. This then fails to be serialized to QJson, failing our unit
tests.
Now, QJSValue types are manually casted to QJsonValues which makes
the tests pass again.
Change-Id: I730c595eee214ebe3d1f83009cd5605f66407f55
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/webchannel/webchannel.pro')
| -rw-r--r-- | src/webchannel/webchannel.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro index 0678346..36cd686 100644 --- a/src/webchannel/webchannel.pro +++ b/src/webchannel/webchannel.pro @@ -27,4 +27,9 @@ SOURCES += \ qwebsocketserver.cpp \ qwebchannelsocket.cpp +qtHaveModule(qml) { + QT += qml + DEFINES += HAVE_QML=1 +} + HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS |