update all data of existing messages in extend()
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Thu, 1 Aug 2013 12:41:08 +0000 (14:41 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Tue, 6 Aug 2013 07:30:39 +0000 (09:30 +0200)
commit20ce1bdb3dd7b1b8868145bf8aec6a9bb788903b
tree067ea47e0cc53568eafaf3ad1354855cfeda570b
parenta4e8dca0c3665a26ff5e7dffada97aeab86dd1a5
update all data of existing messages in extend()

when the message identifier (msgid or context/source/disambiguation)
appears in multiple places, the remaining meta data may be inconsistent
between the occurrences. we need to handle partial data on one hand, and
contradicting data on the other.

Task-number: QTBUG-29131
Task-number: QTBUG-32725
Change-Id: I1ed08e42e266b0b5f014400c137abbcec9ffb93d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
src/linguist/lupdate/cpp.cpp
src/linguist/lupdate/java.cpp
src/linguist/lupdate/qdeclarative.cpp
src/linguist/lupdate/ui.cpp
src/linguist/shared/translator.cpp
src/linguist/shared/translator.h
tests/auto/linguist/lupdate/testdata/good/multiple_locations/main.cpp
tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result