whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/widgets
History
Liang Qi af0d0b9c06 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h
	src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm
	src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h
	src/plugins/platforms/ios/qiosintegration.h
	src/widgets/widgets/qcombobox.cpp
	tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
	tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp

Change-Id: Ibaee7cbbba99e7c4b1d8926e55932ffa6030ce45
 		2016-10-27 10:23:39 +02:00
..
dialogs Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-27 10:23:39 +02:00
effects Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
gestures Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
graphicsview Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-27 10:23:39 +02:00
itemviews Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-08 17:15:55 +02:00
kernel Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-22 21:19:57 +02:00
styles Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +02:00
util Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-05 19:33:26 +02:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-27 10:23:39 +02:00
widgets.pro Add autotest for QGestureRecognizer. 2014-10-23 21:11:28 +02:00