Liang Qi 9419dfe8ee Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Ic747c3c50e68c005b425e7a1ec2a90965527c8bd		2017-04-04 18:09:33 +02:00
..
images	…
snippets	Fixed docs explaining the Frameworks usage	2017-01-06 12:42:24 +00:00
src	Merge remote-tracking branch 'origin/5.9' into dev	2017-04-04 18:09:33 +02:00
qmake.qdocconf	Doc: add navigation info to qmake Manual	2014-12-01 20:04:00 +01:00