qt6-bb10/tests/auto/widgets/dialogs/qdialog
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
BLACKLIST Blacklist and skip various tests that are flakey 2015-06-14 10:50:45 +00:00
qdialog.pro Move SnapToDefaultButton from QPlatformDialogHelper to QPlatformTheme 2013-08-23 08:42:35 +02:00
tst_qdialog.cpp Merge remote-tracking branch 'origin/5.5' into 5.6 2016-01-19 10:03:01 +01:00