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
..
qstate	StateMachine: remove initial state for parallel states.	2015-07-23 07:44:35 +00:00
qstatemachine	Merge remote-tracking branch 'origin/5.5' into 5.6	2016-01-19 10:03:01 +01:00
statemachine.pro	Moving relevant tests to corelib/statemachine	2011-09-01 12:54:42 +02:00