whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/widgets
History
Liang Qi 38c1057f69 Merge remote-tracking branch 'origin/5.6' into 5.7 
This also reverts commit 0d2f0164f4.

Conflicts:
	header.BSD-NEW
	qmake/Makefile.win32
	src/openglextensions/qopenglextensions.cpp
	src/openglextensions/qopenglextensions.h
	src/winmain/qtmain_win.cpp
	src/winmain/qtmain_winrt.cpp
	tools/configure/configureapp.cpp
	util/glgen/qopenglextensions.cpp.header
	util/glgen/qopenglextensions.h.header

Change-Id: If26c6f4111b342378dd88bbdc657e322d2ab6ad8
 		2016-11-23 09:24:36 +01:00
..
dialogs Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-23 09:24:36 +01: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-11-23 09:24:36 +01:00
kernel Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-23 09:24:36 +01: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-11-23 09:24:36 +01:00
widgets.pro Add autotest for QGestureRecognizer. 2014-10-23 21:11:28 +02:00