delta/qt5/qtwebsockets.git, branch v5.4.0-beta1 code.qt.io: qt/qtwebsockets.git Improve the integration of QtWebsockets into general Qt docs 2014-09-28T17:52:58+00:00 Alex Blasche alexander.blasche@digia.com 2014-09-26T10:06:10+00:00 f6175568bb32b87a3d6cd55382fa1c8e1a1de2b4 1.) The websocket qml types page is now hooked into Qt's QML Type by Module page. 2.) Correct incorrectly documented import statement for Qt.WebSockets module in QML. 3.) Add missing \since tags (see QTBUG-36775). Change-Id: I1321db70215fcd16cfbd77dd71a459244241d8a3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> 
1.) The websocket qml types page is now hooked into Qt's QML Type by Module
page.

2.) Correct incorrectly documented import statement for Qt.WebSockets
module in QML.

3.) Add missing \since tags (see QTBUG-36775).

Change-Id: I1321db70215fcd16cfbd77dd71a459244241d8a3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Merge remote-tracking branch 'origin/5.3' into 5.4 2014-09-16T13:29:54+00:00 Frederik Gladhorn frederik.gladhorn@digia.com 2014-09-16T13:29:54+00:00 4301d626f8e6e2dabf3a71205eb632f001827a7f Conflicts: .qmake.conf Change-Id: Ib38d0c86aa010b06b9a201115dfbc9f091abeb0e 
Conflicts:
	.qmake.conf

Change-Id: Ib38d0c86aa010b06b9a201115dfbc9f091abeb0e
Fix QWebSocketServer for clients preferring lowercase http headers. 2014-09-09T06:22:56+00:00 Jorma Tähtinen Jorma.Tahtinen@digia.com 2014-08-06T13:12:54+00:00 ea22c846b285ee4f71efc0fc050a4759880433a8 QWebSocketServer should not use case-sensitive compare to validate http headers for incoming connections. Change-Id: Ie7b8a9f6ca1a0b547eb7a924f6392395f812b0e3 Task-number: QTBUG-40615 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> 
QWebSocketServer should not use case-sensitive compare to validate
http headers for incoming connections.

Change-Id: Ie7b8a9f6ca1a0b547eb7a924f6392395f812b0e3
Task-number: QTBUG-40615
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Bump version 2014-08-29T09:33:48+00:00 Frederik Gladhorn frederik.gladhorn@digia.com 2014-08-29T09:33:48+00:00 c98ca1256d40a59612b31c78c3e4f2f01e1b861f Change-Id: I7da486fc6640df27695971c70bbb50a842b9cca2 
Change-Id: I7da486fc6640df27695971c70bbb50a842b9cca2
Update license headers and add new license files 2014-08-24T15:31:30+00:00 Antti Kokko antti.kokko@digia.com 2014-08-21T10:30:56+00:00 9924fc0b14a30a677d964efaef62539350c656d4 - Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21 Change-Id: I0586e35a7aa99be1b5b3bda580b05897f451acbf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> 
- Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21

Change-Id: I0586e35a7aa99be1b5b3bda580b05897f451acbf
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Fix build with non-OpenSSL SSL-enabled backends 2014-08-13T07:47:10+00:00 Andrew Knight andrew.knight@digia.com 2014-08-13T05:41:16+00:00 cbc538c0f8d6f7dc09fe0828c33e5fac2f851c82 Qt 5.4 introduced the ability to split out the OpenSSL-specific parts of SSL, so allow users of this configuration to still build the SSL server. Change-Id: I03e446c1c0fa4062afe16e58d1b7a80373da12a6 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com> 
Qt 5.4 introduced the ability to split out the OpenSSL-specific parts
of SSL, so allow users of this configuration to still build the SSL
server.

Change-Id: I03e446c1c0fa4062afe16e58d1b7a80373da12a6
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
WinRT: Fix compiler crash (msvc2013 arm) 2014-08-13T07:41:09+00:00 Maurice Kalinowski maurice.kalinowski@digia.com 2014-08-12T12:55:11+00:00 6f482cd3b9d69635543e6decf1c4841f6dfb1578 Visual Studio 2013 Update 3 ARM compiler has issues with the code path trying to optimize it. Instead of disabling optimization in general, use a pragma for the function. x86 compilation is fine though. Change-Id: If099f7d1400cb78958d10c2fd35daef3bb75fc91 Reviewed-by: Andrew Knight <andrew.knight@digia.com> 
Visual Studio 2013 Update 3 ARM compiler has issues with the code path
trying to optimize it. Instead of disabling optimization in general,
use a pragma for the function. x86 compilation is fine though.

Change-Id: If099f7d1400cb78958d10c2fd35daef3bb75fc91
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
remove some pointless noise from project files 2014-08-08T15:01:38+00:00 Oswald Buddenhagen oswald.buddenhagen@digia.com 2014-08-07T11:59:35+00:00 03933809bbc65c6073d7d3a1709e7c1c31758e27 Change-Id: I69b07bfdb69ec4f9ad8c7bf0e6fc327b76113de6 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> 
Change-Id: I69b07bfdb69ec4f9ad8c7bf0e6fc327b76113de6
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
remove custom module pri file 2014-08-08T15:01:29+00:00 Oswald Buddenhagen oswald.buddenhagen@digia.com 2014-08-07T11:59:42+00:00 9da56f68a6c68844ef3f69b4b286576f820a33c5 that's been deprecated since the 5.0 release or so. Change-Id: Icbb9f375261a79b708cce4b6e2a70f71140de1d4 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> 
that's been deprecated since the 5.0 release or so.

Change-Id: Icbb9f375261a79b708cce4b6e2a70f71140de1d4
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Merge remote-tracking branch 'origin/5.3' into dev 2014-07-14T08:31:05+00:00 Frederik Gladhorn frederik.gladhorn@digia.com 2014-07-14T08:27:24+00:00 389547b491985c16d80b7f9de2da972373d7a2f4 Conflicts: src/imports/qmlwebsockets/qqmlwebsocket.h Change-Id: Ib883a07eb1784743adca7a0c38fd156800354f4b 
Conflicts:
	src/imports/qmlwebsockets/qqmlwebsocket.h

Change-Id: Ib883a07eb1784743adca7a0c38fd156800354f4b