qt6-bb10/tests/auto/widgets
Liang Qi 790aef362f Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	.qmake.conf
	configure
	src/corelib/global/qglobal.h
	src/tools/qdoc/node.cpp
	src/tools/qdoc/qdocdatabase.cpp
	tests/auto/corelib/io/qsettings/tst_qsettings.cpp
	tools/configure/configureapp.cpp

Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
2015-10-23 14:45:03 +02:00
..
dialogs tests/auto/widgets: Remove some placeholder formatting. 2015-10-19 12:39:16 +00:00
effects Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
gestures Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
graphicsview tests/auto/widgets: Remove some placeholder formatting. 2015-10-19 12:39:16 +00:00
itemviews Merge remote-tracking branch 'origin/5.6' into dev 2015-10-23 14:45:03 +02:00
kernel tests/auto/widgets: Remove some placeholder formatting. 2015-10-19 12:39:16 +00:00
styles tests/auto/widgets: Remove some placeholder formatting. 2015-10-19 12:39:16 +00:00
util tests/auto/widgets: Remove some placeholder formatting. 2015-10-19 12:39:16 +00:00
widgets Merge remote-tracking branch 'origin/5.6' into dev 2015-10-23 14:45:03 +02:00
widgets.pro Add autotest for QGestureRecognizer. 2014-10-23 21:11:28 +02:00