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
..
.gitignore	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00
BLACKLIST	Tests: Blacklist tests for ubuntu 14.04	2015-04-01 13:59:04 +00:00
qgraphicsproxywidget.pro	Fix autotest on xcb and make it significant again	2015-05-23 11:38:18 +00:00
tst_qgraphicsproxywidget.cpp	Merge remote-tracking branch 'origin/5.5' into 5.6	2016-01-19 10:03:01 +01:00