projects / platform / upstream / qttools.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8a7880b) | patch
synchronize qmake project parser with qt creator
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 1 Jun 2011 15:08:39 +0000 (17:08 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 12 Sep 2011 15:29:43 +0000 (17:29 +0200)
commit3cbff1213d1a7599aea6fdf7be50d46ff1ffe387
tree9aacaa5551b885eccbfc86b0076513ceff980467tree | snapshot
parent8a7880bfa18e95fffb22a34581c5adbe3bb50559commit | diff
synchronize qmake project parser with qt creator

qt creator as of ddb918f.
not feeling like replaying the whole history ...

(cherry picked from commit f1249f94c07654f0b76e7a90fb81ed5b58cd30f7)

Conflicts:
tools/linguist/shared/profileevaluator.cpp

Change-Id: Ief6f9bc0eed4e8a759e95ed321d158f4017710d4
Reviewed-on: http://codereview.qt-project.org/4605
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
14 files changed:
src/linguist/lrelease/main.cpp diff | blob | history
src/linguist/lupdate/main.cpp diff | blob | history
src/linguist/shared/abstractproitemvisitor.h [deleted file] blob | history
src/linguist/shared/ioutils.cpp [new file with mode: 0644] blob
src/linguist/shared/ioutils.h [new file with mode: 0644] blob
src/linguist/shared/profileevaluator.cpp diff | blob | history
src/linguist/shared/profileevaluator.h diff | blob | history
src/linguist/shared/profileparser.cpp [new file with mode: 0644] blob
src/linguist/shared/profileparser.h [new file with mode: 0644] blob
src/linguist/shared/proitems.cpp diff | blob | history
src/linguist/shared/proitems.h diff | blob | history
src/linguist/shared/proparser.pri diff | blob | history
src/linguist/shared/proparser_global.h [new file with mode: 0644] blob
src/linguist/shared/proparserutils.h [deleted file] blob | history
Domain: UI Framework / Qt;