Liang Qi 8f569c740a Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: config.tests/common/atomic64/atomic64.cpp configure src/3rdparty/forkfd/forkfd.c src/corelib/io/forkfd_qt.cpp src/widgets/kernel/qwidgetwindow.cpp tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp tools/configure/configureapp.cpp Change-Id: Ic6168d82e51a0ef1862c3a63bee6722e8f138414		2016-01-19 10:03:01 +01:00
..
arch	Detect NEON on AArch64	2015-11-26 15:40:41 +00:00
common	Merge remote-tracking branch 'origin/5.5' into 5.6	2016-01-19 10:03:01 +01:00
mac/corewlan	Fixed license headers	2015-02-17 18:46:09 +00:00
qpa	Support for Wayland servers on i.MX6	2015-11-02 09:43:29 +00:00
unix	Update bundled HarfBuzz-NG to 1.0.6	2015-11-03 16:20:57 +00:00
win/directwrite	Windows: Include DirectWrite support by default if available	2015-07-21 08:21:34 +00:00
x11	Update copyright headers	2015-02-11 06:49:51 +00:00
.gitignore	Initial import from the monolithic Qt.	2011-04-27 12:05:43 +02:00
.qmake.conf	Handle INCLUDE and LIB environment variables in config.tests for MinGW	2013-11-22 07:30:57 +01:00