qt/qtdeclarative.git - Qt Declarative (Quick 2)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/5.4' into 5.5	Liang Qi	2015-04-16	1	-14/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/qml/debugger/qv4profilerservice/qv4profilerservice.pro tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler.pro Change-Id: I76d87e3df97ebdba902ca3d7488c1582eca2a83c
\| *	Use qt_subtract_from_timeout instead of duplicating qt_timeout_value	Daniel Teske	2015-04-14	1	-14/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The same function was duplicated 5 times in qtbase, so create one copy to rule them all and use it also in QtDeclarative. Change-Id: I4e39a7ee0541ce4fe9710cea344e537ee011bbe9 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* \|	Update copyright headers	Jani Heikkinen	2015-02-12	1	-7/+7
\|/ \| \| \| \| \| \| \| \|	Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
*	Update license headers and add new licenses	Jani Heikkinen	2014-08-25	1	-19/+11
\| \| \| \| \| \| \| \| \|	- Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
*	fix whitespace	Oswald Buddenhagen	2014-01-22	1	-1/+1
\| \| \| \| \| \| \|	remove trailing spaces and expand tabs Change-Id: Ieacb9d096b612c45d1a64700044c114d1f7522bc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
*	Fix a warning about not using a set variable	Laszlo Papp	2013-09-05	1	-0/+1
\| \| \| \| \| \| \| \| \|	6a36bcb7945109daebd6464ee6d0a3f6724fb18b fixed similar warnings, but apparently the tools folder was left out. Change-Id: If7f889e404264688fa6208afcd3bfdba5a161714 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
*	Update copyright year in Digia's license headers	Sergio Ahumada	2013-01-10	1	-1/+1
\| \| \| \| \| \|	Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
*	Change copyrights from Nokia to Digia	Iikka Eklund	2012-09-23	1	-24/+24
\| \| \| \| \| \| \|	Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
*	QmlDebuggingTests: Separate out public and private tests	Aurindam Jana	2012-03-19	1	-0/+546
	Remove dependencies on quick-private from all possible debugging auto tests and list them under public tests. Change-Id: I688b5b36fdf3d6fbcb6cef2a975ecd1bf679af2b Reviewed-by: Kai Koehne <kai.koehne@nokia.com>