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
..
dialogs	Merge remote-tracking branch 'origin/5.5' into 5.6	2016-01-19 10:03:01 +01:00
effects	tests/auto/widgets: Replace Q[TRY]_VERIFY(a == b) by Q[TRY]_COMPARE(a, b).	2015-07-31 11:50:10 +00:00
gestures	Merge remote-tracking branch 'origin/5.5' into dev	2015-07-01 11:05:26 +02:00
graphicsview	Merge remote-tracking branch 'origin/5.5' into 5.6	2016-01-19 10:03:01 +01:00
itemviews	tests: remove use of obsolete QStyleOption*V<N>	2015-11-03 16:11:51 +00:00
kernel	Fix reentrancy regression in QShortcutMap after c7e5e1d9e	2016-01-12 22:08:04 +00:00
styles	tests: remove use of obsolete QStyleOption*V<N>	2015-11-03 16:11:51 +00:00
util	Make use of preprocessor easier to understand.	2016-01-04 13:59:14 +00:00
widgets	Merge remote-tracking branch 'origin/5.5' into 5.6	2016-01-19 10:03:01 +01:00
widgets.pro	Add autotest for QGestureRecognizer.	2014-10-23 21:11:28 +02:00