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
..
qmacstyle	QMacStyle: CC_ComboBox is now HITheme-free	2018-04-12 00:20:42 +00:00
qstyle	winrt: Make widgets/styles auto tests pass	2018-05-25 11:02:21 +00:00
qstyleoption	tests/auto/widgets: use QCOMPARE(., nullptr)	2016-11-30 07:24:47 +00:00
qstylesheetstyle	Merge branch '5.11' into dev	2018-07-31 13:33:14 +02:00
styles.pro	Use qtConfig throughout in qtbase	2016-08-19 04:28:05 +00:00