AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f5aa65349c
qt5base-lts/examples/widgets
History
Liang Qi dbef41f43e Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	examples/qtestlib/tutorial5/containers.cpp
	examples/widgets/tools/tools.pro
	src/corelib/io/qprocess.cpp
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/network/kernel/qdnslookup_unix.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/testlib/qtestcase.cpp
	tools/configure/configureapp.cpp

Change-Id: I838ae7f082535a67a4a53aa13a21ba5580758be8
2016-05-06 15:36:44 +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-06 15:36:44 +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