Merge remote-tracking branch 'origin/5.3' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 26 Jun 2014 15:29:10 +0000 (17:29 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 26 Jun 2014 15:29:10 +0000 (17:29 +0200)
commit3f99082f3bb81982e0c6777875fb5c2a1d9033df
treebae72f2e8723cf52c8dd0cffb016a1e2a5c69312
parent717ba7e69a1c16f8d4b26984a63b3c0450b131bf
parent00f77bdc5beb62e980216cfee906ab7aa1d1c4f7
Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
.qmake.conf

Change-Id: Idce64ab613c4e07ffb38cac4115690b885f110f2
src/websockets/qwebsocket_p.cpp