delta/qt5/qtquickcontrols.git - code.qt.io: qt/qtquickcontrols.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Doc: add documentation to Dashboard examplev5.10.0-beta2	Nico Vertriest	2017-10-11	1	-2/+4
\| \| \| \| \| \|	Task-number: QTBUG-60648 Change-Id: I79b9fdfde18041d95b7aa422bfb4d188ed907589 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
*	Merge remote-tracking branch 'origin/5.6' into 5.7	Liang Qi	2016-05-10	1	-3/+13
\| \| \| \| \| \| \| \|	Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
*	fix example installs	Oswald Buddenhagen	2016-04-28	1	-0/+320
	this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>