Liang Qi a02863234d Merge remote-tracking branch 'origin/5.7' into dev ... Conflicts: configure mkspecs/common/wince/qplatformdefs.h src/plugins/platforms/directfb/qdirectfbbackingstore.cpp src/plugins/platforms/xcb/qxcbbackingstore.cpp Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c		2016-03-22 07:28:42 +01: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	qmake: Remove Windows CE support.	2016-03-10 13:33:44 +00: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