Andy Shaw fa1fb5ed94 Only add the res_file to the generated files if there is no rc_file ... If both the rc_file and res_file was added to the project then in MSVC 2012 it would cause an error complaining of a duplicated resource. Task-number: QTBUG-29826 Change-Id: Ib3401b423208cd8c90895038c9cbadd80c39b542 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>		2013-07-02 16:33:08 +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	Introduce QMAKE_CC_O_FLAG	2013-03-25 23:11:22 +01:00
mingw_make.h	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
msbuild_objectmodel.cpp	basic manifest tool support in vc(x)proj generator	2013-06-25 12:08:38 +02:00
msbuild_objectmodel.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
msvc_nmake.cpp	qmake/nmake: do not remove NDEBUG from DEFINES	2013-04-09 17:49:32 +02:00
msvc_nmake.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
msvc_objectmodel.cpp	basic manifest tool support in vc(x)proj generator	2013-06-25 12:08:38 +02:00
msvc_objectmodel.h	basic manifest tool support in vc(x)proj generator	2013-06-25 12:08:38 +02:00
msvc_vcproj.cpp	Only add the res_file to the generated files if there is no rc_file	2013-07-02 16:33:08 +02:00
msvc_vcproj.h	basic manifest tool support in vc(x)proj generator	2013-06-25 12:08: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	qmake/Win: disable "find highest lib version" feature by default	2013-03-26 21:44:15 +01:00
winmakefile.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00