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
..
doc	Doc: added more details about contains(variablename,value)	2013-06-19 12:15:47 +02:00
generators	Only add the res_file to the generated files if there is no rc_file	2013-07-02 16:33:08 +02:00
library	Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable	2013-06-25 14:31:00 +02:00
cachekeys.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
main.cpp	Merge remote-tracking branch 'gerrit/release' into stable	2013-03-21 08:49:01 +01:00
Makefile.unix	run syncqt only for builds from git	2013-06-03 17:59:47 +02:00
Makefile.win32	run syncqt only for builds from git	2013-06-03 17:59:47 +02:00
meta.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
meta.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
option.cpp	make sure qmake finds itself in CWD on windows	2013-04-26 12:08:24 +02:00
option.h	remove unused member Option::application_argv0	2013-03-01 11:07:19 +01:00
project.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
project.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
property.cpp	install host libraries into -hostprefix	2013-05-13 21:54:40 +02:00
property.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmake_pch.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qmake-docs.pro	move qmake docs into qtbase	2013-06-17 15:41:55 +02:00
qmake.pri	qfilesystemengine_mac.cpp is empty => purge	2013-03-14 19:49:38 +01:00
qmake.pro	update comment	2013-06-17 15:42:03 +02:00