qt/qtquickcontrols2.git - Qt Quick Controls 2

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/5.6' into dev	Liang Qi	2016-02-12	1	-3/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/templates/qquickabstractbutton.cpp Change-Id: Icfd472451a150524dded704b4be5d286da21a6da
\| *	Material: corrected padding of TabButton	Nikita Krupenko	2016-02-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	According to design guidelines, padding should be at least 12. Change-Id: Ifbe57107fc7e15e3a7e09a3923549ba23dc2f7e3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
\| *	Material: increase the height of tabs	J-P Nurmi	2016-02-07	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Material design specifies 48dp as a height for tabs, which is also the minimum touch target size. Change-Id: I7c67e3e0aec92d197df14fd60bbd1ebcd55131f6 Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* \|	TabButton: migrage from label to contentItem	J-P Nurmi	2016-02-06	1	-11/+6
\|/ \| \| \| \|	Change-Id: I026bca7620235fbdd5e8b870c7e4f643ae0dcf49 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
*	Material: fix mis-aligned text in tabs	J-P Nurmi	2015-12-17	1	-2/+2
\| \| \| \| \| \| \| \|	Same as 5f5654f but for the Material style. Change-Id: I5d206c396099af6dafbe828438cdf9262896502e Task-number: QTBUG-48718 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
*	Material: move to QQuickProxyTheme way for font settings	Liang Qi	2015-12-01	1	-2/+0
\| \| \| \| \|	Change-Id: Ib3fe1809887bbcf3db1822c6eb0182e0181cf70f Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
*	Specify baseline offsets	J-P Nurmi	2015-11-25	1	-0/+1
\| \| \| \| \| \|	Change-Id: I4845a7beac2edc0f0bcc1c810edd7d9e86f31c87 Task-number: QTBUG-49468 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
*	Add Material style	Mitch Curtis	2015-11-12	1	-0/+75
	Change-Id: I93662a53b42858a5b65154c5ede334182e738dde Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>