delta/qt5/qtwebsockets.git - code.qt.io: qt/qtwebsockets.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update plugins.qmltypes	Kai Koehne	2015-10-15	1	-3/+3
\| \| \| \| \| \| \|	0610115192f4a1 changed the port type from uint16 to int. Change-Id: I800fe254648d026c8e29d93a2945bdf8380aa950 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
*	Update plugins.qmltypes for QtWebSockets and Qt.WebSockets	Liang Qi	2015-05-26	2	-1/+98
\| \| \| \| \| \|	Change-Id: I7cacbce1625015636e92b2fd5f2ade694a97a5c9 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
*	Fix qmldir for qmlwebsockets_compat	Liang Qi	2015-05-22	1	-1/+1
\| \| \| \| \| \| \| \| \|	It is not supported to have both "import Qt.WebSockets 1.0" and "import QtWebSockets 1.0" in the same project. Task-number: QTBUG-46205 Change-Id: I71b824b091f4491b8ab5e1eae8290a51159b03e2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
*	Rename QML import from "Qt.WebSockets" to "QtWebSockets"	Sze Howe Koh	2014-12-01	2	-0/+11
	This is in line with all other modules (e.g. "QtWebEngine 1.x", "QtQuick 2.x", "QtWebKit 3.x", "QtSensors 5.x") The old name is retained for compatibility with code from Qt 5.3. This is achieved by having a dummy qmldir file in the old location. Change-Id: I66576abe5edb44c3338c47b2980f34574129af01 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>