Liang Qi 6bc1ce9c16 Merge remote-tracking branch 'origin/5.5' into 5.6 ... Conflicts: src/corelib/kernel/qcfsocketnotifier.cpp src/tools/qdoc/qdocindexfiles.cpp Change-Id: Iae365b23afc611de8794f22cceae8b210d25aa8a		2015-10-23 23:14:22 +02:00
..
cesdkhandler.cpp	Fixing Wec2013 qmake support for VS2013 SDKs.	2015-07-21 07:53:35 +00:00
cesdkhandler.h	Fix incorrect pass by value.	2015-04-21 11:37:54 +00:00
mingw_make.cpp	merge MingwMakefileGenerator::findLibraries() into Win32MakefileGenerator	2015-10-02 14:01:24 +00:00
mingw_make.h	merge MingwMakefileGenerator::findLibraries() into Win32MakefileGenerator	2015-10-02 14:01:24 +00:00
msbuild_objectmodel.cpp	WinRT: Fix Visual Studio 2015 project generation	2015-08-07 10:33:07 +00:00
msbuild_objectmodel.h	Merge remote-tracking branch 'origin/5.4' into 5.5	2015-02-24 21:02:08 +01:00
msvc_nmake.cpp	Stop generating implicit suffix rules in Makefiles	2015-10-09 15:15:25 +00:00
msvc_nmake.h	inline NmakeMakefileGenerator::getPdbTarget()	2015-10-01 16:19:23 +00:00
msvc_objectmodel.cpp	Merge remote-tracking branch 'origin/5.5' into 5.6	2015-10-23 23:14:22 +02:00
msvc_objectmodel.h	WinRT: Add qmake support for Windows 10	2015-05-26 11:09:41 +00:00
msvc_vcproj.cpp	Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6	2015-10-02 17:24:58 +00:00
msvc_vcproj.h	remove superfluous method re-implementation	2015-04-27 13:25:27 +00:00
msvc_vcxproj.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
msvc_vcxproj.h	Update copyright headers	2015-02-11 06:49:51 +00:00
winmakefile.cpp	Stop generating implicit suffix rules in Makefiles	2015-10-09 15:15:25 +00:00
winmakefile.h	merge MingwMakefileGenerator::findLibraries() into Win32MakefileGenerator	2015-10-02 14:01:24 +00:00