whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/corelib
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 Updated license headers 2016-01-21 18:55:18 +00:00
codecs Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
global Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
io Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
itemmodels Updated license headers 2016-01-21 18:55:18 +00:00
json Update testdata 2016-02-17 04:50:50 +00:00
kernel Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-25 14:03:45 +02:00
mimetypes Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-27 09:18:05 +02:00
plugin Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
statemachine Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
thread Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-24 20:37:33 +01:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
xml Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
corelib.pro
…