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
..
integrity	fix license headers	2013-05-30 12:16:49 +02:00
mac	Xcode: Don't set TARGET_BUILD_DIR; that's handled by a copy phase	2013-06-11 16:35:53 +02:00
unix	qmake: Change two scopes to mac instead of macx	2013-07-02 16:33:08 +02:00
win32	Only add the res_file to the generated files if there is no rc_file	2013-07-02 16:33:08 +02:00
makefile.cpp	Add spaces around the components of a pkg-config Cflags: field	2013-04-09 07:13:54 +02:00
makefile.h	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
makefiledeps.cpp	Fix leak when fd != -1	2013-03-23 14:42:45 +01:00
makefiledeps.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
metamakefile.cpp	actually use the temp variable we just assigned ...	2013-03-12 18:54:59 +01:00
metamakefile.h	remove some cryptic code relating to output directories	2013-03-07 00:42:56 +01:00
projectgenerator.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
projectgenerator.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
xmloutput.cpp	remove pointless QString::arg call	2013-05-30 12:16:52 +02:00
xmloutput.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00