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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Bump version	Oswald Buddenhagen	2017-06-30	1	-1/+1
\| \| \| \|	Change-Id: If2f94cf279858115eab6033859d29d2636965c03
*	Bump version	Oswald Buddenhagen	2017-05-10	1	-1/+1
\| \| \| \|	Change-Id: I23bc6a2f8734b34ab5193a3ebcbebde3c98b2611
*	Bump version	Oswald Buddenhagen	2016-08-29	1	-1/+1
\| \| \| \|	Change-Id: I9c9d3330bf75912b55a99f2bb88822b1cefb0f5e
*	Merge remote-tracking branch 'origin/5.7' into dev	Edward Welbourne	2016-07-21	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/webchannel/doc/src/index.qdoc src/webchannel/qwebchannelabstracttransport.cpp Overlapping changes to documentation; constructed hybrid. src/webchannel/qmetaobjectpublisher.cpp tests/auto/webchannel/tst_webchannel.cpp tests/auto/webchannel/tst_webchannel.h Both sides made additions; in the same place. Change-Id: Iff12970978b70946dc3e1290841aca2d35c9c1d0
\| *	Merge remote-tracking branch 'origin/5.6' into 5.7	Edward Welbourne	2016-07-15	1	-1/+1
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Alleged Conflicts: examples/webchannel/chatclient-html/doc/src/chatclient-html.qdoc examples/webchannel/chatclient-qml/doc/src/chatclient-qml.qdoc examples/webchannel/chatserver-cpp/doc/src/chatserver-cpp.qdoc In each case, the two sides agreed byte-for-byte. Not quite sure what git thought the conflict was ! Change-Id: I5da9695b667f4112848c520b630ab1304d61cea3
\| \| *	do not enable example installs explicitly any more	Oswald Buddenhagen	2016-05-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it's done centrally now. Change-Id: I0922b2083b594cdf61f4606fe17c9c61c0d4683a Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
\| \| *	Bump version	Oswald Buddenhagen	2016-05-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I73f3738a4ba90af8bc8572edecda56bec7d1f60b
\| \| *	Bump version	Oswald Buddenhagen	2016-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Change-Id: I7c7c1a8702698b9b37752eaa7cb5d676857b9be8
* \| \|	Bump version	Oswald Buddenhagen	2016-02-23	1	-1/+1
\|/ / \| \| \| \| \| \|	Change-Id: I88a9000f1bba81e35ad45e768244fda4f8df469a
* \|	Bump version	Oswald Buddenhagen	2015-09-10	1	-1/+1
\|/ \| \| \|	Change-Id: I631db196a1969efc3f45678f00819ac8105e9c82
*	Bump version	Oswald Buddenhagen	2015-02-24	1	-1/+1
\| \| \| \|	Change-Id: I61e5bc4b85f9456b0e3f0084027104d6ace56e70
*	Bump version	Oswald Buddenhagen	2014-08-09	1	-1/+1
\| \| \| \|	Change-Id: I1d56bb01e6c9997eb7eba45e9d804109a3cb6384
*	Align .qmake.conf with other Qt modules.	Milian Wolff	2014-07-28	1	-2/+2
\| \| \| \| \| \| \| \|	This module will be shipped with Qt 5.4.0, so set the version accordingly. Furthermore, the warning_clean flag is added to CONFIG. Change-Id: Id8936dc496bf585f838842bcc29fff238523927b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
*	Restructure sources and assimilate to Qt module structure.	Milian Wolff	2013-12-12	1	-0/+4
	This module can hopefully be done in time for 5.3. This commit changes the source structure and QMake files to adapt to typical Qt modules. With this in place, we can now use QT += webchannel in qmake files to link against the pure Qt/C++ QtWebChannel library. The QML plugin is separated from it and can be loaded optionally, if the quick module could be found. Also added is now a qmlplugindump for tooling integration. Note that the Qt.labs namespace is removed. The test file structure is also adapted to how its done in the QtDeclarative module. Note that this setup apparently does not support to run tests without running make install first. Change-Id: I1c15d72e7ab5f525d5a6f651f4e965ef86bc17bd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>