diff options
author | Andy Shaw <andy.shaw@digia.com> | 2013-07-02 14:44:53 +0200 |
---|---|---|
committer | Andy Shaw <andy.shaw@digia.com> | 2014-11-27 14:04:31 +0100 |
commit | 3705ea476c00cbe9138714ddd416be0077b5b61d (patch) | |
tree | 91b8f48c143b5e7b9321211d94ca9e9faaba3a3e /tests/auto/patternistexamples | |
parent | e3e64ed76ab9d4e0b13cd6fb2ae6beb1ac9efb52 (diff) | |
download | qt4-tools-3705ea476c00cbe9138714ddd416be0077b5b61d.tar.gz |
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>
Diffstat (limited to 'tests/auto/patternistexamples')
0 files changed, 0 insertions, 0 deletions