whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/widgets/kernel
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
..
qaction Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-22 21:19:57 +02:00
qactiongroup Updated license headers 2016-01-21 18:55:18 +00:00
qapplication Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-22 21:19:57 +02:00
qboxlayout Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-28 11:51:35 +02:00
qdesktopwidget Updated license headers 2016-01-21 18:55:18 +00:00
qformlayout Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-23 09:24:36 +01:00
qgridlayout Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-28 11:51:35 +02:00
qlayout Remove the traces of the discontinued android-no-sdk platform 2016-03-30 10:12:34 +00:00
qshortcut Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-08 17:15:55 +02:00
qsizepolicy Updated license headers 2016-01-21 18:55:18 +00:00
qstackedlayout Updated license headers 2016-01-21 18:55:18 +00:00
qtooltip Updated license headers 2016-01-21 18:55:18 +00:00
qwidget Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-13 15:18:02 +02:00
qwidget_window Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
qwidgetaction Updated license headers 2016-01-21 18:55:18 +00:00
qwidgetmetatype Updated license headers 2016-01-21 18:55:18 +00:00
qwidgetsvariant Updated license headers 2016-01-21 18:55:18 +00:00
qwindowcontainer Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
kernel.pro Introducing QWidget::createWindowContainer() 2013-01-25 14:11:07 +01:00