qt/qtquickcontrols2.git - Qt Quick Controls 2

	Commit message (Collapse)	Author	Age	Files	Lines
*	Controls: update license headers	J-P Nurmi	2016-04-14	1	-2/+2
\| \| \| \| \| \| \|	This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. Change-Id: Ib653135662bfd353a73290539995e8e5be211587 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
*	QQuickMaterialProgressStrip: don't recreate rectangle in a loop	Anton Kudryavtsev	2016-03-29	1	-1/+2
\| \| \| \| \| \| \|	Just cache it. Change-Id: I3055352378b14e6ccebb6de91163f01da0b0b0d3 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
*	ProgressBar: use contentItem instead of indicator	J-P Nurmi	2016-03-21	1	-3/+7
\| \| \| \| \|	Change-Id: I8bd21b32b6f3d333c119d77b629b46fe411c06eb Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
*	Merge remote-tracking branch 'origin/5.6' into 5.7	J-P Nurmi	2016-02-25	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/templates/qquickrangeslider_p.h Change-Id: Ibe8ec18a7e22080f69f316d0394af1d03517ce93
\| *	QQuickMaterialProgressStrip: reset the transformation matrix	J-P Nurmi	2016-02-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The trasformation matrix for the indeterminate animation has to be reset when switching back to non-indeterminate mode, or else the indicator is translated to a wrong position. Change-Id: I8489a504f0b9626dbd0172ba0fba842f4528d027 Task-number: QTBUG-51312 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* \|	Merge remote-tracking branch 'origin/5.6' into dev	J-P Nurmi	2016-01-28	1	-7/+7
\|/ \| \| \| \| \| \| \| \| \| \|	Conflicts: src/imports/controls/material/qtlabsmaterialstyleplugin.cpp src/templates/qquickapplicationwindow_p.h src/templates/qquickcombobox.cpp src/templates/qquickcombobox_p.h src/templates/qquickpopup.cpp Change-Id: Ibd87e907bc8abf1f675147761ea8bb0b40722478
*	Material ProgressBar: implement indeterminate animator	J-P Nurmi	2016-01-28	1	-0/+248
	The indicator is now a single QQuickItem, and runs in the render thread, so keeps animating even if the app is busy. Before: RESULT : tst_CreationTime::material():"ProgressBar": 0.30 msecs per iteration (total: 79, iterations: 256) After: RESULT : tst_CreationTime::material():"ProgressBar": 0.18 msecs per iteration (total: 93, iterations: 512) Change-Id: I3ec0982da9a02751725692c72da10a01d2afbfdc Task-number: QTBUG-50161 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>