summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-04-0114-225/+457
|\
| * handle qt-format PO flagsOswald Buddenhagen2010-03-311-1/+24
| * handle encoding of PO filesOswald Buddenhagen2010-03-311-134/+202
| * make variable naming politically correct :-DOswald Buddenhagen2010-03-311-4/+4
| * add Plural-Forms header in PO writerOswald Buddenhagen2010-03-316-26/+65
| * simplify arabic plural ruleOswald Buddenhagen2010-03-311-1/+1
| * don't mark untranslated messages as fuzzy in PO filesOswald Buddenhagen2010-03-311-2/+2
| * support gettext POT filesOswald Buddenhagen2010-03-311-0/+14
| * fix writing of length variant separators in the singular caseOswald Buddenhagen2010-03-311-0/+2
| * make PO header handling less of a monster hackOswald Buddenhagen2010-03-311-44/+80
| * fix updating of X-Source-Language PO headerOswald Buddenhagen2010-03-311-0/+3
| * interpret source language "en" as "POSIX" (more precisely: "none specified")Oswald Buddenhagen2010-03-311-0/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-317-44/+89
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-307-44/+89
| | |\
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-303-4/+12
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-302-2/+3
| | | | |\
| | | | | * Fix compilation with Sun CC:Thiago Macieira2010-03-291-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
| | | * | | qdoc: Added <div> elements to some html output for class references.Martin Smith2010-03-305-42/+86
| | | | |/ | | | |/|
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-319-42/+222
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-311-2/+0
| |\ \ \ \
| * | | | | Doc: Updated the qdoc manual with i18n info. Fixed a code example.David Boddie2010-03-302-18/+90
| * | | | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-301-17/+16
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-307-24/+132
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Define QT_NO_EGL in configure.exeTom Cooksey2010-03-261-0/+4
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-266-24/+128
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | cetest: remove source file duplicates from cetest.proJoerg Bornemann2010-03-261-2/+0
| | | * | | Paintbuffer single frame profiling.Samuel Rødal2010-03-261-9/+90
| | | * | | Fix bad mergeOlivier Goffart2010-03-251-15/+7
| | | * | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-2519-172/+383
| | | |\ \ \
| | | * | | | Fix warnings and build on mingwThierry Bastian2010-03-252-5/+5
| | | * | | | cetest build fixJoerg Bornemann2010-03-251-1/+2
| | | * | | | cetest build fix for TCP sync connectionJoerg Bornemann2010-03-252-0/+24
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-315-11/+11
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Minor cleanup for visual test framework.Michael Brasser2010-03-315-11/+11
| | |_|_|_|/ | |/| | | |
* | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-311-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | no need for CONFIG += ordered hereOswald Buddenhagen2010-03-301-2/+0
* | | | | | Fix viewer resizing on reload and File->openMartin Jones2010-03-301-17/+16
| |/ / / / |/| | | |
* | | | | Simplify import path.Warwick Allison2010-03-291-2/+9
| |/ / / |/| | |
* | | | Designer: Fix broken resource view filtering.Friedemann Kleint2010-03-261-1/+1
| |_|/ |/| |
* | | Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-252-35/+28
|\ \ \ | | |/ | |/|
| * | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-243-14/+19
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Warwick Allison2010-03-238-101/+420
| |\ \ \
| * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-222-35/+28
| |\ \ \ \
| | * | | | Deprecate inline Script {} blocksAaron Kennedy2010-03-221-30/+28
| | * | | | Remove dead performance measurement code from QMLAaron Kennedy2010-03-221-5/+0
* | | | | | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-243-14/+19
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-233-14/+19
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | compile fix for mingw (also removes some warnings)Thierry Bastian2010-03-233-14/+19
| | |/ / /