summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-2866-348/+971
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-01-2866-348/+971
| |\
| | * don't falsely complain about mismatched codecfortrOswald Buddenhagen2010-01-2712-13/+164
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into staging...Daniel Molkentin2010-01-2754-322/+788
| | |\
| | | * add directories with sources to list of project rootsOswald Buddenhagen2010-01-276-3/+132
| | | * add -codecfortr optionOswald Buddenhagen2010-01-271-2/+17
| | | * sanitize lupdate's behavior regarding SUBDIRS projectsOswald Buddenhagen2010-01-2741-98/+592
| | | * absorb cmdline tests into "good" structureOswald Buddenhagen2010-01-276-42/+4
| | | * add ability to set working dir for testOswald Buddenhagen2010-01-271-7/+13
| | | * support multiple output filesOswald Buddenhagen2010-01-271-10/+14
| | | * fix printing output from failed commandOswald Buddenhagen2010-01-271-1/+1
| | | * unshare pro post-processing codeOswald Buddenhagen2010-01-275-216/+73
| | | * 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-272-3/+1
| | | * fix bogus warning messageOswald Buddenhagen2010-01-271-4/+1
| | * | Fix QSettings default paths not being initialized when setPath() is calledDaniel Molkentin2010-01-271-19/+25
| | |/
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-286-16/+33
|\ \ \ | |/ / |/| |
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-01-276-16/+33
| |\ \
| | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-01-273-4/+20
| | |\ \
| | | * | Removing unneeded code from QFontEngine::getGlyphPositions()Alessandro Portale2010-01-271-3/+0
| | | * | Added a selfsigned version of sqlite3.sisMiikka Heikkinen2010-01-271-0/+0
| | | * | Added support for embedded sis name/uid patching for SymbianMiikka Heikkinen2010-01-271-1/+20
| | * | | QComboBox drawn incorrectly in RightToLeft modeSami Merila2010-01-271-5/+7
| | |/ /
| | * | Polishing QS60Style by removing compiler warningSami Merila2010-01-273-7/+6
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-i...Qt Continuous Integration System2010-01-282-0/+708
|\ \ \ \ | |/ / / |/| | |
| * | | Add additional text and painting benchmarks.Michael Brasser2010-01-282-0/+708
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-275-8/+31
|\ \ \ \ | |_|_|/ |/| | |
| * | | Avoid call markParentDirty twice in prepareGeometryChangeLeonardo Sobral Cunha2010-01-273-4/+9
| * | | Added a warning to QGLWidget::renderText().Trond Kjernåsen2010-01-271-2/+20
| * | | Compiler warning.Bjørn Erik Nilsen2010-01-271-2/+2
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6...Pulse Build System2010-01-272-2/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Designer: Add lower/raise to context menu.Friedemann Kleint2010-01-272-2/+5
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-i...Pulse Build System2010-01-2736-561/+1008
|\ \ \ \
| * | | | Compile with no-webkit - add missing semi-colons.Rhys Weatherley2010-01-261-2/+2
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-i...Pulse Build System2010-01-2635-559/+1006
| |\ \ \ \
| | * | | | Fixes visibility update missing when doing setParentItem on graphicsitemLeonardo Sobral Cunha2010-01-264-36/+127
| | * | | | Stabilize tst_QGraphicsScene::polishItems2 (new test)Bjørn Erik Nilsen2010-01-261-2/+2
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2634-525/+881
| | |\ \ \ \
| | | * | | | Fixed an infinite loop that could occur when reading invalid BMP images.Trond Kjernåsen2010-01-261-1/+1
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2533-524/+880
| | | |\ \ \ \
| | | | * | | | Updated docs regarding QGLWidget::renderText() limitations.Trond Kjernåsen2010-01-251-0/+7
| | | | * | | | Added optimization flag to QGraphicsItemPrivate.Samuel Rødal2010-01-252-0/+25
| | | | * | | | Fixed child items with graphics effects not inheriting opacity.Samuel Rødal2010-01-253-6/+57
| | | | * | | | Made the trace replayer handle limited resolution cases better.Samuel Rødal2010-01-251-6/+22
| | | | * | | | Small optimization in raster paint engine.Samuel Rødal2010-01-251-2/+2
| | | | * | | | Another ASSERT while deleting spansGabriel de Dietrich2010-01-252-1/+11
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-2527-509/+756
| | | | |\ \ \ \
| | | | | * | | | Implement QDirectFBPixmapData::scrollAnders Bakken2010-01-222-3/+29
| | | | | * | | | Potential crash when adding items from QGraphicsWidget::polishEvent().Bjørn Erik Nilsen2010-01-223-18/+68