whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/examples/widgets
History
Liang Qi 818014b449 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	configure
	src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
	src/network/access/qnetworkaccessmanager.cpp
	src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.cpp
	src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmcursor.h
	src/widgets/widgets/qlineedit_p.cpp
	src/widgets/widgets/qlineedit_p.h
	src/winmain/winmain.pro
	tests/auto/corelib/io/qstorageinfo/tst_qstorageinfo.cpp
	tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
	tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h
	tests/auto/testlib/selftests/expected_cmptest.teamcity
	tests/auto/testlib/selftests/expected_cmptest.txt
	tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
	tools/configure/configureapp.cpp

Change-Id: Ib9997b0d0f91946e4081d36c0c6b696c5c983b2a
 		2016-05-19 12:55:27 +02:00
..
animation Unify license header usage. 2016-03-29 10:20:03 +00:00
desktop Unify license header usage. 2016-03-29 10:20:03 +00:00
dialogs Unify license header usage. 2016-03-29 10:20:03 +00:00
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
draganddrop Unify license header usage. 2016-03-29 10:20:03 +00:00
effects Unify license header usage. 2016-03-29 10:20:03 +00:00
gestures Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-07 10:47:20 +02:00
graphicsview Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00
itemviews Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-19 12:55:27 +02:00
layouts Unify license header usage. 2016-03-29 10:20:03 +00:00
mac Updated license headers 2016-01-21 18:55:32 +00:00
mainwindows Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-13 06:55:37 +02:00
painting Unify license header usage. 2016-03-29 10:20:03 +00:00
richtext Unify license header usage. 2016-03-29 10:20:03 +00:00
scroller Unify license header usage. 2016-03-29 10:20:03 +00:00
statemachine Unify license header usage. 2016-03-29 10:20:03 +00:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
tutorials Unify license header usage. 2016-03-29 10:20:03 +00:00
widgets add cross-platform tablet->mouse event synth; enable on Android 2016-04-08 19:33:28 +00:00
windowcontainer Unify license header usage. 2016-03-29 10:20:03 +00:00
widgets.pro purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00