summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-1424-173/+111
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-1424-173/+111
| |\ |/ /
| * Revert "Frequency to SampleRate and channels to channelCount." missedKurt Korbatits2010-01-141-20/+0
| * Revert "Frequency to SampleRate and channels to channelCount."Kurt Korbatits2010-01-1418-116/+89
| * Revert "Added setChannelCount() to QAudioFormat."Kurt Korbatits2010-01-1416-57/+42
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-142-1/+2
|\ \
| * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Iain2010-01-138894-9441/+10896
| |\ \
| * | | Use MMP keyword, not compiler flags, to update FPU option on SymbianIain2010-01-132-1/+2
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-134-163/+168
|\ \ \ \
| * \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-13184-1528/+3165
| |\ \ \ \
| * | | | | Doc: Describe QStackedWidget::removeWidget() more thoroughly.David Boddie2010-01-131-2/+5
| * | | | | Doc: Resized the window and added a title.David Boddie2010-01-121-160/+161
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6David Boddie2010-01-11131-959/+2201
| |\ \ \ \ \
| * | | | | | Doc: Added a missing example to the list of Graphics View examples.David Boddie2010-01-111-0/+1
| * | | | | | Doc: Clarified why a path matches in the example given.David Boddie2010-01-081-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-131-10/+11
|\ \ \ \ \ \ \
| * | | | | | | Use a QTextBrowser instead of a read only QTextEditHarald Fernengel2010-01-131-10/+11
* | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-139-26/+104
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2010-01-1394-1093/+1072
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-1370-755/+388
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2010-01-138918-9686/+12094
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | 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
generated by cgit v0.12 at 2025-01-23 19:09:09 (GMT)