qt/qtbase.git - Qt Base (Core, Gui, Widgets, Network, ...)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/stable' into dev	Frederik Gladhorn	2013-08-27	1	-1/+2
\| \| \| \| \| \| \|	Conflicts: examples/widgets/doc/src/addressbook-fr.qdoc Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48
*	Merge remote-tracking branch 'origin/stable' into dev	Frederik Gladhorn	2013-08-21	1	-0/+61
\| \| \| \| \| \| \| \| \|	Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
*	Doc: Fixed qmake manual's images and snippets directories.	Jerome Pasion	2013-08-13	2	-0/+975
	-corrected qmake.qdocconf file to not read the manual twice -moved the snippets and images directories to make sure they are not in the src directory Task-number: QTBUG-32580 Change-Id: I7b702ce3b1c8709bbb1f473f70625083242f1a40 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>