Liang Qi f34e73a16a Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: src/corelib/kernel/qobject.cpp src/gui/painting/qpaintengine_raster.cpp Change-Id: I74e1779832f43d033708dcfd6b666c7b4f0111fb		2016-04-11 09:12:36 +02:00
..
mingw_make.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
mingw_make.h	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
msbuild_objectmodel.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
msbuild_objectmodel.h	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_nmake.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-03-22 07:28:42 +01:00
msvc_nmake.h	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_objectmodel.cpp	qmake: remove some empty user-defined dtors	2016-02-15 14:45:40 +00:00
msvc_objectmodel.h	qmake: remove some empty user-defined dtors	2016-02-15 14:45:40 +00:00
msvc_vcproj.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-04-11 09:12:36 +02:00
msvc_vcproj.h	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_vcxproj.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
msvc_vcxproj.h	Updated license headers	2016-01-21 18:55:18 +00:00
winmakefile.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
winmakefile.h	Updated license headers	2016-01-21 18:55:18 +00:00