qt/qtquickcontrols2.git - Qt Quick Controls 2

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update license headers to silence qtqa/tst_license warnings	J-P Nurmi	2017-02-24	1	-4/+4
\| \| \| \| \| \| \| \| \| \|	Sync with the qtbase/header.XXX. The license headers were matching qtbase/header.XXX-OLD, which makes qtqa/tst_license flood warnings: Old license being used for foo.qdoc Change-Id: I199bf303a2d648e0d5f7bc01cb0814a5f945eeff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
*	Welcome to 2017	J-P Nurmi	2017-01-09	1	-1/+1
\| \| \| \| \|	Change-Id: If68cff4efacc7dc5719c8b8e61937e85e9076870 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
*	Merge remote-tracking branch 'origin/5.7' into 5.8	J-P Nurmi	2016-10-25	1	-2/+3
\| \| \| \| \| \| \| \| \| \|	Conflicts: src/imports/controls/doc/src/qtquickcontrols2-material.qdoc src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc src/imports/controls/material/ComboBox.qml Change-Id: I2a57070f96691cb6bbdaae460fbc60a85be435de
*	Doc: configuration file	J-P Nurmi	2016-10-25	1	-0/+94
	Change-Id: I3de16850673488a8c67afc6b45a79d5bb86f9013 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>