don't ignore changes to meta data when updating translation units
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Thu, 1 Aug 2013 15:48:58 +0000 (17:48 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 6 Aug 2013 07:30:47 +0000 (09:30 +0200)
commit836f4ac4d465feec9510e3e0cf5c5e8483785178
treec2628f2df4d76b35424781fc08ebbcd16478e9c6
parentf904d2be2fae63570980570976ab5f25c78e5b51
don't ignore changes to meta data when updating translation units

Task-number: QTBUG-18890
Change-Id: Iceb466105d5fae56da0e2d26cb245fa610fed865
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
src/linguist/lupdate/merge.cpp
tests/auto/linguist/lupdate/testdata/good/mergecpp/finddialog.cpp
tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before
tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result