summaryrefslogtreecommitdiffstats
path: root/tools/linguist/lupdate
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-082-1/+2
|\ \ | |/ |/|
| * fix translations from some header files being omittedOswald Buddenhagen2010-06-071-0/+1
| * propagate code change back to .g sourceOswald Buddenhagen2010-06-031-1/+1
* | don't use qWarning() - or even qFatal()! - gratuitously.Oswald Buddenhagen2010-06-035-151/+147
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-04-161-27/+70
|\ \ | |/
| * create magic comment messages in "finished" stateOswald Buddenhagen2010-04-151-2/+7
| * make QT_TR_NOOP work in static initializersOswald Buddenhagen2010-04-151-6/+47
| * make HashString and HashStringList objects smallerOswald Buddenhagen2010-04-151-13/+10
| * remove pointless manual assignments from token type enumOswald Buddenhagen2010-04-151-6/+6
* | Fix compilation: Linguist uses QtDeclarative .cpp and private headersThiago Macieira2010-04-021-1/+1
* | jui files are no c++ ...Oswald Buddenhagen2010-03-291-0/+1
* | scan some more file types by defaultOswald Buddenhagen2010-03-291-1/+1
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-8/+20
|\ \ | |/
| * fix "using namespace" recursion crashOswald Buddenhagen2010-03-051-8/+20
* | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec...Warwick Allison2010-02-242-8/+8
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-181-1/+1
|\ \
| * | Fix copyright year.Jason McDonald2010-02-161-1/+1
* | | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-161-21/+20
|/ /
* | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso...Warwick Allison2010-02-044-1/+249
|\ \
| * \ 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-149-65/+58
| |\ \
| * \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-272-18/+24
| |\ \ \
| * \ \ \ Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-113-56/+57
| |\ \ \ \
| * \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-091-23/+53
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-041-5/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-301-9/+9
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2009-10-291-9/+9
| | |\ \ \ \ \ \ \
| * | | | | | | | | fix headersWarwick Allison2009-10-291-16/+16
| |/ / / / / / / /
| * | | | | | | | 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-022-6/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-09-292-356/+507
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-151-1/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-159-36/+36
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-031-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-319-117/+117
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-08-191-91/+149
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-08-139-10/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of ../../qt into kinetic-declarativeuiAaron Kennedy2009-07-311-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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-103-29/+114
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-07-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Support compile-in-namespace for the declarative module.Michael Brasser2009-06-301-2/+2
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-06-199-27/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Renamed the QML front-end.Roberto Raggi2009-06-111-7/+7
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-06-091-6/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-291-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \