Liang Qi 7950b6b283 Merge remote-tracking branch 'origin/5.9' into dev ... Conflicts: src/corelib/tools/qbytearray.h src/corelib/tools/qdatetime.h src/corelib/tools/qstring.h src/corelib/tools/qversionnumber.h src/plugins/platforms/android/qandroidplatformintegration.cpp tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d		2017-04-20 12:31:27 +02:00
..
cocoafunctions	doc: Correct include guard	2017-04-07 10:09:00 +00:00
doc	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-06 09:04:55 +02:00
eglfsfunctions	Unify license header usage.	2016-03-29 10:20:03 +00:00
helper	Updated license headers	2016-01-15 12:25:24 +00:00
nativecontexts	Silence platformheaders syncqt warning about qt_egl_p.h	2016-12-16 04:07:22 +00:00
waylandfunctions	Move waylandfunctions from qtwayland to qtbase	2016-02-11 12:58:29 +00:00
windowsfunctions	Doc: rephrase parameter description to avoid qdoc error message	2017-04-18 10:37:50 +00:00
xcbfunctions	XCB: Replace LGPL21 with LGPL license header	2017-02-28 15:34:58 +00:00
platformheaders.pro	Move waylandfunctions from qtwayland to qtbase	2016-02-11 12:58:29 +00:00