Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 12 Aug 2013 10:48:24 +0000 (12:48 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 12 Aug 2013 10:48:24 +0000 (12:48 +0200)
commitf1be89afbfbc876fea858a10278fc58387c50533
tree251e5a62af6618d6512f01e6c12f3f22bf54d264
parent9d3cbd0a5fe7fea1c830a82df52ffcf88352a1ab
parent90d59cb8ca0428ef048aa17d0e9d92acc0424ee8
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf
src/linguist/lupdate/cpp.cpp

Change-Id: Id27ac2ea8438e60a940d4ae3719ad393d7ad88ea
src/linguist/linguist.pro
src/linguist/lupdate/cpp.cpp
src/linguist/lupdate/main.cpp
src/linguist/lupdate/merge.cpp
src/linguist/lupdate/qdeclarative.cpp
src/linguist/shared/translator.cpp
tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.before
tests/auto/linguist/lupdate/testdata/good/mergecpp/project.ts.result
tests/auto/linguist/lupdate/testdata/good/multiple_locations/project.ts.result
tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result