3 Commits

Author	SHA1	Message	Date
Frederik Gladhorn	190fa97c83	Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: examples/widgets/doc/src/addressbook-fr.qdoc Change-Id: Id1196e8e0c6445f1616c3f29234c974d809f8e48	2013-08-27 22:51:09 +02:00
Frederik Gladhorn	c8ca300e49	Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a	2013-08-21 11:03:18 +02:00
Jerome Pasion	4bea83fe71	Doc: Fixed qmake manual's images and snippets directories. ... -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>	2013-08-13 01:38:54 +02:00