summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lupdate/main.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-06-091-1/+1
|\
| * Fixed compilation for solaris based compilers, macro doesn't require trailing...Toby Tomkins2010-06-091-1/+1
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-06-081-0/+1
|\ \ | |/ |/|
| * fix translations from some header files being omittedOswald Buddenhagen2010-06-071-0/+1
* | don't use qWarning() - or even qFatal()! - gratuitously.Oswald Buddenhagen2010-06-031-44/+46
* | jui files are no c++ ...Oswald Buddenhagen2010-03-291-0/+1
* | scan some more file types by defaultOswald Buddenhagen2010-03-291-1/+1
* | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-041-1/+4
|\ \
| * \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-02-021-108/+245
| |\ \ | | |/
| * | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2010-01-141-9/+1
| |\ \
| * \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-271-4/+12
| |\ \ \
| * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-251-0/+2
| |\ \ \ \
| * \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-10-021-5/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-291-21/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-151-4/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-311-13/+13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-08-131-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of ../qt into kinetic-declarativeuiAaron Kennedy2009-07-291-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-07-231-0/+5
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-07-151-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-07-101-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-06-191-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Various fixes for Qml support in lupdate.Michael Brasser2009-05-181-1/+2
| * | | | | | | | | | | | | | | Start work on translation support in Qml.Michael Brasser2009-05-181-0/+2
* | | | | | | | | | | | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-011-106/+243
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | don't falsely complain about mismatched codecfortrOswald Buddenhagen2010-01-271-13/+13
| * | | | | | | | | | | | | | | add directories with sources to list of project rootsOswald Buddenhagen2010-01-271-3/+12
| * | | | | | | | | | | | | | | add -codecfortr optionOswald Buddenhagen2010-01-271-2/+17
| * | | | | | | | | | | | | | | sanitize lupdate's behavior regarding SUBDIRS projectsOswald Buddenhagen2010-01-271-95/+169
| * | | | | | | | | | | | | | | unshare pro post-processing codeOswald Buddenhagen2010-01-271-12/+48
| * | | | | | | | | | | | | | | complain if both sources and projects are given on the cmdlineOswald Buddenhagen2010-01-271-0/+4
| * | | | | | | | | | | | | | | still complain if only ts files where specified on the cmdlineOswald Buddenhagen2010-01-271-7/+7
| * | | | | | | | | | | | | | | do not sort the TS filesOswald Buddenhagen2010-01-271-1/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch '4.6'Thiago Macieira2010-01-131-7/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | remove dead codeOswald Buddenhagen2010-01-061-8/+0
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | support @-style list files on the command lineOswald Buddenhagen2009-11-261-61/+79
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | don't use qWarning for things which are not really warningsOswald Buddenhagen2009-11-201-4/+11
* | | | | | | | | | | | | don't overwrite explicitly specified CODECFORTR on UTF-16 inputOswald Buddenhagen2009-11-191-0/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | actually guess the target language from the file nameOswald Buddenhagen2009-10-221-0/+2
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-10-011-5/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | make -help reflect realityOswald Buddenhagen2009-10-011-5/+4
| * | | | | | | | | | Update license headers again.Jason McDonald2009-09-081-4/+4
* | | | | | | | | | | optimize directory scanningOswald Buddenhagen2009-09-231-21/+12
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Update license headers again.Jason McDonald2009-09-091-4/+4
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch '4.5' into 4.6Thiago Macieira2009-08-311-13/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Update tech preview license header.Jason McDonald2009-08-311-13/+13
| * | | | | | | Update license headers.Jason McDonald2009-08-111-1/+1
* | | | | | | | Update contact URL in license headers.Jason McDonald2009-08-121-1/+1
| |_|_|_|_|_|/ |/| | | | | |