summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* really, *really* fix the test :}Oswald Buddenhagen2010-01-121-1/+1
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-1270-755/+388
|\
| * QFile cannot deal with crlf-translated stdio, so use binary modeOswald Buddenhagen2010-01-121-0/+12
| * remove trimming of (expected) outputOswald Buddenhagen2010-01-122-3/+4
| * really fix the autotestOswald Buddenhagen2010-01-122-1/+1
| * support regexp-like quantifiers of expected output linesOswald Buddenhagen2010-01-121-26/+100
| * remove superfluous \r filteringOswald Buddenhagen2010-01-121-8/+4
| * print actual rather than expected output for matching textOswald Buddenhagen2010-01-121-3/+3
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-1168-720/+270
| |\
| | * Do not set the font size unnecessarily in the simulated s60 style.Christian Kamm2010-01-114-8/+18
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-0964-712/+252
| | |\
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-0964-712/+252
| | | |\
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-0864-712/+252
| | | | |\
| | | | | * Doc typos fixedJarek Kobus2010-01-082-4/+3
| | | | | * Translations: Update German for 4.6.1Friedemann Kleint2010-01-081-0/+28
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-0861-708/+221
| | | | | |\
| | | | | | * fix test under windowsOswald Buddenhagen2010-01-071-0/+1
| | | | | | * don't complain about unresolved base when the reference is absoluteOswald Buddenhagen2010-01-071-1/+1
| | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-0760-707/+219
| | | | | | |\
| | | | | | | * make the lupdate tests more verbose in case of failureOswald Buddenhagen2010-01-064-251/+37
| | | | | | | * don't use qmake for test setupOswald Buddenhagen2010-01-0634-215/+5
| | | | | | | * move equivalent of output_ts test to good/Oswald Buddenhagen2010-01-068-53/+3
| | | | | | | * look for the .result file in the dir where the output is expected to goOswald Buddenhagen2010-01-063-7/+1
| | | | | | | * fix sametext and number heuristicsOswald Buddenhagen2010-01-067-45/+178
| | | | | | | * fix number heuristics, part 1Oswald Buddenhagen2010-01-061-2/+2
| | | | | | | * no point in specifying -ts when a .pro file is specifiedOswald Buddenhagen2010-01-063-4/+3
| | | | | | | * clean up the lupdatecmd filesOswald Buddenhagen2010-01-064-16/+3
| | | | | | | * tidy up the test .pro filesOswald Buddenhagen2010-01-0635-154/+35
| | | | | | | * remove dead codeOswald Buddenhagen2010-01-061-8/+0
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-123-33/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-113-33/+8
| |\ \ \ \ \ \ \ |/ / / / / / / /
| * | | | | | | Fix for QTBUG-7267 Qs60Style::drawControl() does not align CE_ItemViewItemJani Hautakangas2010-01-111-1/+1
| * | | | | | | Fix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds ofJani Hautakangas2010-01-112-32/+7
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-113-4/+14
|\ \ \ \ \ \ \ \
| * | | | | | | | Correctly determine QScriptValue::isQObject() for QObjects using theMichael Brasser2010-01-113-4/+14
* | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-111-4/+12
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | (Sqlite2) Fix for QTBUG-6421Bill King2010-01-111-4/+12
|/ / / / / / / /
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-098-1/+146
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Doc: the QTextDecoder need to be destroyed, reflect that in the exampleOlivier Goffart2010-01-081-0/+1
| * | | | | | | added CONFIG += console to qlalr.proJoerg Bornemann2010-01-081-0/+1
| * | | | | | | Add new benchmark for some qtext features.Thomas Zander2010-01-084-0/+137
| * | | | | | | Add texture glyph width cache default.Stefano Pironato2010-01-081-1/+5
| * | | | | | | Update changes fileAlan Alpert2010-01-081-0/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-0953-546/+1087
|\ \ \ \ \ \ \ | |/ / / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | Merge commit 'origin/mmfphonon' into 4.6Gareth Stockwell2010-01-086-31/+10
| |\ \ \ \ \
| | * | | | | Fixed build breakage on S60 3.1 due to audio effects changesGareth Stockwell2010-01-086-31/+10
| * | | | | | Added a flag to avoid construction of application panes.axis2010-01-088-6/+172
| * | | | | | Fixed QDesktopWidget autotest.axis2010-01-081-1/+1
| * | | | | | Fixed a doc error.axis2010-01-081-1/+0
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-0844-538/+935
| |\ \ \ \ \ \ |/ / / / / / /