qt5base-lts/util
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
..
accessibilityinspector Updated license headers 2016-01-21 18:55:18 +00:00
aglfn Updated license headers 2016-01-21 18:55:18 +00:00
corelib/qurl-generateTLDs Updated license headers 2016-01-21 18:55:18 +00:00
edid EDID parser library 2017-05-02 09:11:56 +00:00
glgen Unify license header usage. 2016-03-29 10:20:03 +00:00
harfbuzz Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
includemocs QtCore: include mocs 2017-05-05 03:03:30 +00:00
integrity Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
lexgen Handle indirect sibling selector 2016-07-27 20:18:02 +00:00
local_database Add byte-based units to CLDR data 2017-06-13 11:28:09 +00:00
plugintest Updated license headers 2016-01-21 18:55:18 +00:00
unicode Fix a bug in the generation of the Unicode joining property data 2017-12-13 19:14:49 +00:00
xkbdatagen Updated license headers 2016-01-21 18:55:18 +00:00