Liang Qi 23a36fd2bf Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/corelib/io/qprocess_win.cpp src/widgets/itemviews/qheaderview.cpp Change-Id: I0a59ade9cd6e91f770fdf298a7d72a41e79fd761		2016-04-27 09:18:05 +02:00
..
contextinfo.pro	Add an example for creating OpenGL contexts	2014-02-28 18:00:39 +01: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