From fa1fb5ed945650d45cf9b61906232cfbae11360e Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 2 Jul 2013 14:44:53 +0200 Subject: 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 --- qmake/generators/win32/msvc_vcproj.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qmake/generators') diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 20ff9073f9..e2df222639 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1322,7 +1322,8 @@ void VcprojGenerator::initGeneratedFiles() vcProject.GeneratedFiles.addFiles(project->values("GENERATED_SOURCES")); vcProject.GeneratedFiles.addFiles(project->values("GENERATED_FILES")); vcProject.GeneratedFiles.addFiles(project->values("IDLSOURCES")); - vcProject.GeneratedFiles.addFiles(project->values("RES_FILE")); + if (project->values("RC_FILE").isEmpty()) + vcProject.GeneratedFiles.addFiles(project->values("RES_FILE")); vcProject.GeneratedFiles.addFiles(project->values("QMAKE_IMAGE_COLLECTION")); // compat if(!extraCompilerOutputs.isEmpty()) vcProject.GeneratedFiles.addFiles(extraCompilerOutputs.keys()); -- cgit v1.2.3