summaryrefslogtreecommitdiffstats
path: root/tools/linguist/shared
Commit message (Collapse)AuthorAgeFilesLines
* make quote/escape parsing more qmake-compatibleOswald Buddenhagen2009-04-291-50/+67
|
* Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-151-1/+10
|\
| * protect against circular inclusion of pro/pri filesOswald Buddenhagen2009-04-151-1/+7
| | | | | | | | Task-number: 250574
| * do not crash on lines starting with an equal signOswald Buddenhagen2009-04-151-0/+3
| |
| * fix uninitialized variable readOswald Buddenhagen2009-04-151-4/+12
| |
| * add some commentsOswald Buddenhagen2009-04-151-4/+4
| |
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-151-2/+2
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * compile with aCCOswald Buddenhagen2009-04-071-2/+2
| |
* | amend 3570e978058816745101a69b552ad9d07e349542 for masterOswald Buddenhagen2009-04-021-5/+6
| |
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-026-33/+77
|\ \ | |/ | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * re-initialize some variables for each fileOswald Buddenhagen2009-04-021-5/+4
| |
| * fix evaluation of CONFIG() and contains()Oswald Buddenhagen2009-04-021-3/+4
| | | | | | | | cherry-picked from creator's b3ec859c80bd0656cfc48cfe6514ec4f631b8206
| * fix wrong evaluation of arguments to qmake functionsOswald Buddenhagen2009-04-021-1/+2
| | | | | | | | cherry-pick 28dacdfdf3eed04ec47a1e8eb206bd3ffb979c08 from creator
| * duplicate message handling improvementsOswald Buddenhagen2009-04-025-50/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - lrelease will not abort on duplicates any more - lconvert now gets noisy, but only if messages within one file are duplicated (combining files with identical messages is ok) - lupdate stays silent, but will eliminate duplicates again - consolidate handling of dual-encoded and duplicate messages - for performance - instead of the format loader, now the app is responsible for calling the duplicate handler. this allows for the fine-grained control necessary for optimal performance. Task-number: 247738
| * optimize duplicate resolutionOswald Buddenhagen2009-04-021-5/+26
| | | | | | | | use pointers in the index hash to avoid needless allocs and copies
* | Merge branch '4.5'Thiago Macieira2009-03-279-242/+359
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: tools/linguist/lupdate/qscript.cpp tools/linguist/lupdate/qscript.g tools/linguist/lupdate/ui.cpp tools/linguist/shared/cpp.cpp tools/linguist/shared/qph.cpp tools/linguist/shared/translator.h
| * properly process backslash line continuationsOswald Buddenhagen2009-03-271-6/+13
| | | | | | | | | | | | this is a backport of be5a9587865f9f042cac8feb5296b71b11a1a80f Task-number: 249633
| * static is even better than constOswald Buddenhagen2009-03-271-4/+4
| |
| * declare type info next to the type, not "somewhere"Oswald Buddenhagen2009-03-272-2/+2
| |
| * properly deal with messages which appear in multiple encodingsOswald Buddenhagen2009-03-276-220/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | in ts 1.1 and qm files, messages appear in their native encoding. that means that a message can appear multiple times - once in utf8 and once in the codecForTr. however, in ts 2.0 files, everything is utf8 and messages can have a utf8 flag for the later transformation into qm. unfortunately, there was no flag to mark that the message is needed in *both* encodings, and the respective case was completely ignored when reading ts 1.1 and qm files (causing error messages). Task-number: 249022 AutoTest: 322690
| * micro-optimization: don't evaluate same condition twiceOswald Buddenhagen2009-03-271-2/+2
| |
| * actually ignore untranslated messages as it claimsOswald Buddenhagen2009-03-271-2/+4
| |
| * avoid empty codec nameOswald Buddenhagen2009-03-272-2/+4
| |
| * beautify / micro-optimizeOswald Buddenhagen2009-03-271-3/+4
| |
| * proper encoding and escapingOswald Buddenhagen2009-03-271-4/+37
| |
| * whitespaceOswald Buddenhagen2009-03-2710-16/+16
| |
| * Long live Qt 4.5!Lars Knoll2009-03-2330-0/+15020
|
* Long live Qt!Lars Knoll2009-03-2321-0/+8614