Qt Forward Merge Bot e56d3b03ed Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: src/corelib/tools/qlocale_data_p.h (Regenerated by running the scripts in util/local_database/) src/gui/opengl/qopengltextureuploader.cpp Done-With: Edward Welbourne <edward.welbourne@qt.io> Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io> Change-Id: I12df7f066ed0a25eb109f61c4b8d8dea63b683e2		2019-05-09 13:06:11 +00:00
..
images	Doc: Fixed qmake manual's images and snippets directories.	2013-08-13 01:38:54 +02:00
snippets	Fixed docs explaining the Frameworks usage	2017-01-06 12:42:24 +00:00
src	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-05-09 13:06:11 +00:00
qmake.qdocconf	Generate documentation .tags files for all of the docs	2018-10-31 08:38:02 +00:00