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

..

contextinfo.pro

fix example installs

2016-05-03 10:25:33 +00:00

main.cpp

Merge remote-tracking branch 'origin/5.6' into 5.7

2016-04-27 09:18:05 +02:00

renderwindow.cpp

Unify license header usage.

2016-03-29 10:20:03 +00:00

renderwindow.h

Unify license header usage.

2016-03-29 10:20:03 +00:00

widget.cpp

Merge remote-tracking branch 'origin/5.6' into 5.7

2016-04-27 09:18:05 +02:00

widget.h

Unify license header usage.

2016-03-29 10:20:03 +00:00