projects / qt:qt.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e3e64ed) | patch
Only add the res_file to the generated files if there is no rc_file
authorAndy Shaw <andy.shaw@digia.com>
Tue, 2 Jul 2013 12:44:53 +0000 (14:44 +0200)
committerAndy Shaw <andy.shaw@digia.com>
Thu, 27 Nov 2014 13:04:31 +0000 (14:04 +0100)
commit3705ea476c00cbe9138714ddd416be0077b5b61d
tree91b8f48c143b5e7b9321211d94ca9e9faaba3a3etree | snapshot
parente3e64ed76ab9d4e0b13cd6fb2ae6beb1ac9efb52commit | diff
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>
(cherry picked from qtbase/fa1fb5ed945650d45cf9b61906232cfbae11360e)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
qmake/generators/win32/msvc_vcproj.cpp diff | blob | history
6b46b7419a5aee9bd5fce67b7bfa8afe8e