Lars Knoll db92f2f3aa Merge remote-tracking branch 'origin/5.9' into 5.10 ... Conflicts: .qmake.conf mkspecs/win32-g++/qmake.conf src/corelib/global/qglobal_p.h src/corelib/global/qoperatingsystemversion_p.h src/corelib/io/qfilesystemengine_win.cpp src/network/bearer/qbearerengine.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/sql/doc/snippets/code/doc_src_sql-driver.cpp src/widgets/kernel/qwidget_p.h src/widgets/kernel/qwidgetwindow.cpp src/widgets/styles/qfusionstyle.cpp tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8		2017-12-30 12:09:53 +01:00
..
dialogs	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-12-30 12:09:53 +01:00
effects	Set sharedPainter correctly for QGraphicsEffect	2017-12-12 20:21:07 +00:00
graphicsview	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-11-09 11:47:57 +01:00
itemviews	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-12-30 12:09:53 +01:00
kernel	test: blacklist tst_QWidget::multipleToplevelFocusCheck()	2017-11-14 04:55:43 +00:00
styles	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-11-09 11:47:57 +01:00
util	testlib: start sharing common helper functions	2017-11-04 20:11:22 +00:00
widgets	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-12-30 12:09:53 +01:00
widgets.pro	Move QGestureRecognizer test to widgets/kernel	2017-06-02 18:36:11 +00:00