Merge remote-tracking branch 'origin/5.3' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 14 Jul 2014 08:27:24 +0000 (10:27 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 14 Jul 2014 08:31:05 +0000 (10:31 +0200)
commit389547b491985c16d80b7f9de2da972373d7a2f4
treef0ab62e434e1097c377815c1f4ea89538ec781f5
parentaef4cba4ce5f3acfa6765c71283d9363dffe97b7
parentca03374390c4d5f4e8f2156f3b2038f984ed39d4
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
src/imports/qmlwebsockets/qqmlwebsocket.h

Change-Id: Ib883a07eb1784743adca7a0c38fd156800354f4b
src/imports/qmlwebsockets/qqmlwebsocket.h
src/websockets/qwebsocketserver.h