whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/examples/widgets
History
Liang Qi 57057f76ad Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	.qmake.conf
	config.tests/unix/nis/nis.cpp
	mkspecs/unsupported/freebsd-g++/qplatformdefs.h
	src/corelib/tools/qdatetime.cpp
	src/corelib/tools/qsimd.cpp
	src/corelib/tools/qsimd_p.h
	src/network/access/access.pri
	src/network/access/qnetworkreplynsurlconnectionimpl.mm
	src/network/access/qnetworkreplynsurlconnectionimpl_p.h
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/printsupport/windows/qwindowsprintdevice.cpp
	tests/auto/corelib/kernel/qobject/tst_qobject.cpp
	tests/auto/network/access/qnetworkreply/BLACKLIST
	tests/auto/widgets/widgets/qopenglwidget/BLACKLIST

Change-Id: I4b32055bbf922392ef0264fd403405416fffee57
 		2016-06-06 09:04:55 +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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02: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