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
..
qmake.conf	Merge remote-tracking branch 'origin/5.9' into 5.10	2017-12-30 12:09:53 +01:00
qplatformdefs.h	Updated license headers	2016-01-15 12:25:24 +00:00