Edward Welbourne 23c9d4c98f Merge branch '5.11' into dev ... Conflicts: qmake/library/qmakebuiltins.cpp src/plugins/platforms/windows/qwindowstabletsupport.h src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/widgets/styles/qstylesheetstyle.cpp tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp Done-With: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e		2018-07-31 13:33:14 +02: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 branch '5.11' into dev	2018-07-31 13:33:14 +02:00
qmake.qdocconf	Merge remote-tracking branch 'origin/5.10' into dev	2018-01-20 22:36:19 +01:00