qt/qtquickcontrols.git - Qt Quick Controls

	Commit message (Collapse)	Author	Age	Files	Lines
*	texteditor example: Fix path to editpaste iconv5.9.0-beta4	Friedemann Kleint	2017-05-04	1	-1/+1
\| \| \| \| \| \| \| \| \|	Drop prefix so that it can be found from either resources or files. Change-Id: Ib9dcab86f22bff0f8a3d7f0f22aa35d717b3569f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
*	Merge remote-tracking branch 'origin/5.6' into 5.7	Liang Qi	2016-05-10	2	-6/+26
\| \| \| \| \| \| \| \|	Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
*	fix example installs	Oswald Buddenhagen	2016-04-28	22	-0/+418
	this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>