whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/widgets/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
..
qabstractbutton Updated license headers 2016-01-21 18:55:18 +00:00
qabstractscrollarea Updated license headers 2016-01-21 18:55:18 +00:00
qabstractslider Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +02:00
qabstractspinbox Updated license headers 2016-01-21 18:55:18 +00:00
qbuttongroup Updated license headers 2016-01-21 18:55:18 +00:00
qcalendarwidget Updated license headers 2016-01-21 18:55:18 +00:00
qcheckbox Updated license headers 2016-01-21 18:55:18 +00:00
qcombobox Merge remote-tracking branch 'origin/5.6' into 5.7 2016-07-15 20:47:57 +02:00
qcommandlinkbutton Updated license headers 2016-01-21 18:55:18 +00:00
qdatetimeedit Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-23 09:24:36 +01:00
qdial Updated license headers 2016-01-21 18:55:18 +00:00
qdialogbuttonbox Updated license headers 2016-01-21 18:55:18 +00:00
qdockwidget Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
qdoublespinbox Updated license headers 2016-01-21 18:55:18 +00:00
qfocusframe Updated license headers 2016-01-21 18:55:18 +00:00
qfontcombobox Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
qframe Updated license headers 2016-01-21 18:55:18 +00:00
qgroupbox Updated license headers 2016-01-21 18:55:18 +00:00
qkeysequenceedit Updated license headers 2016-01-21 18:55:18 +00:00
qlabel Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-15 09:58:16 +01:00
qlcdnumber Updated license headers 2016-01-21 18:55:18 +00:00
qlineedit Revert "QWindow::destroy(): only reset QGuiApp::focus_window and friends as a last resort" 2016-02-02 02:12:26 +00:00
qmainwindow Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-31 09:26:35 +01:00
qmdiarea Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
qmdisubwindow QGuiApplication, platform plugins: don't modify AA_DontUseNativeMenuBar 2016-09-26 14:13:20 +00:00
qmenu Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
qmenubar Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-27 10:23:39 +02:00
qopenglwidget Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
qplaintextedit Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
qprogressbar Updated license headers 2016-01-21 18:55:18 +00:00
qpushbutton Updated license headers 2016-01-21 18:55:18 +00:00
qradiobutton Updated license headers 2016-01-21 18:55:18 +00:00
qscrollarea Updated license headers 2016-01-21 18:55:18 +00:00
qscrollbar Updated license headers 2016-01-21 18:55:18 +00:00
qsizegrip Updated license headers 2016-01-21 18:55:18 +00:00
qslider Updated license headers 2016-01-21 18:55:18 +00:00
qspinbox Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-29 08:13:40 +02:00
qsplashscreen Updated license headers 2016-01-21 18:55:18 +00:00
qsplitter Updated license headers 2016-01-21 18:55:18 +00:00
qstackedwidget Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-08 17:15:55 +02:00
qstatusbar Updated license headers 2016-01-21 18:55:18 +00:00
qtabbar Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
qtabwidget Updated license headers 2016-01-21 18:55:18 +00:00
qtextbrowser Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-24 20:37:33 +01:00
qtextedit Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
qtoolbar Updated license headers 2016-01-21 18:55:18 +00:00
qtoolbox Updated license headers 2016-01-21 18:55:18 +00:00
qtoolbutton Updated license headers 2016-01-21 18:55:18 +00:00
widgets.pro
…