Liang Qi ee0951d69b Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: src/network/access/qftp.cpp src/widgets/itemviews/qheaderview.cpp src/widgets/itemviews/qlistview.cpp tests/auto/network/access/qftp/tst_qftp.cpp Change-Id: I9f928f25d45d8944dd60bb583f649fc1615bc5d9		2016-04-07 10:47:20 +02:00
..
cesdkhandler.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-02-11 08:25:04 +01:00
cesdkhandler.h	Updated license headers	2016-01-21 18:55:18 +00: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.6' into 5.7	2016-03-21 09:02:57 +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.6' into 5.7	2016-04-07 10:47:20 +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