qt/qtquickcontrols2.git - Qt Quick Controls 2

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/5.7' into 5.8	J-P Nurmi	2016-09-14	1	-0/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p_p.h Change-Id: Ie7b4a114ad27a4cad337c91e8ebcf696b0e845d7
\| *	Delete replaced delegates after Component.completed() is emitted	Mitch Curtis	2016-09-12	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This avoids the issue "Object destroyed during incubation" error. A proper fix is still required in the QML engine. Change-Id: I3c168cfe2d8c295662bcb5886e99a0f95748e302 Task-number: QTBUG-50992 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* \|	Add hover support to TextArea & TextField	J-P Nurmi	2016-06-29	1	-0/+1
\|/ \| \| \| \| \|	Task-number: QTBUG-50003 Change-Id: Ie101ba8840fba2a7503da8de77d9cf2a3c91d562 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
*	Templates: update license headers	J-P Nurmi	2016-04-14	1	-2/+2
\| \| \| \| \| \| \|	This file is part of the Qt Quick Templates 2 module of the Qt Toolkit. Change-Id: I39ef9cbb00f55a32b7a43f11ffbdfbb40b84e124 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
*	Templates: rename the C++ module to qtquicktemplates2	J-P Nurmi	2016-04-13	1	-0/+106
	Change-Id: I146da903b46f5c2caf865e37291c25376b49021a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>