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 a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
 		2016-11-01 06:02:55 +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.7' into dev 2016-07-19 20:14:40 +02:00
qcommandlinkbutton Updated license headers 2016-01-21 18:55:18 +00:00
qdatetimeedit Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-29 00:38:01 +02: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 Updated license headers 2016-01-21 18:55:18 +00:00
qlcdnumber Updated license headers 2016-01-21 18:55:18 +00:00
qlineedit Remove tests/auto/qtest-config.h. 2016-04-12 14:56:49 +00:00
qmainwindow Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qmdiarea Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
qmdisubwindow Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
qmenu Merge remote-tracking branch 'origin/5.7' into dev 2016-06-13 12:46:46 +02:00
qmenubar Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01: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.7' into dev 2016-06-13 12:46:46 +02:00
qprogressbar Updated license headers 2016-01-21 18:55:18 +00:00
qpushbutton QtWidgets: Remove Windows CE. 2016-04-07 10:24:45 +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 QtWidgets: Remove Windows CE. 2016-04-07 10:24:45 +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.7' into dev 2016-06-13 12:46:46 +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 Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00