J-P Nurmi 0fcce50af0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67		2014-06-05 22:26:44 +02:00
..
cesdkhandler.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
cesdkhandler.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mingw_make.cpp	Add support for using -isystem in qmake	2014-01-20 02:42:31 +01:00
mingw_make.h	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
msbuild_objectmodel.cpp	Add build support for Windows Phone 8.1	2014-05-22 07:59:49 +02:00
msbuild_objectmodel.h	move platform toolset retrieval to VcprojGenerator	2014-04-03 18:31:38 +02:00
msvc_nmake.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-06-05 22:26:44 +02:00
msvc_nmake.h	qmake: use the manifest embedding feature of the MSVC linker	2014-04-01 15:56:37 +02:00
msvc_objectmodel.cpp	Add build support for Windows Phone 8.1	2014-05-22 07:59:49 +02:00
msvc_objectmodel.h	Add build support for Windows Phone 8.1	2014-05-22 07:59:49 +02:00
msvc_vcproj.cpp	Add build support for Windows Phone 8.1	2014-05-22 07:59:49 +02:00
msvc_vcproj.h	move platform toolset retrieval to VcprojGenerator	2014-04-03 18:31:38 +02:00
msvc_vcxproj.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
msvc_vcxproj.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
winmakefile.cpp	in command line args, escape tabs as well	2014-04-07 17:37:13 +02:00
winmakefile.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00