summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-2659-1108/+5113
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | cetest: remove source file duplicates from cetest.proJoerg Bornemann2010-03-261-2/+0
| | | * | | | | | | | Remove EGLImage create/destroy resolving from VG pixmap dataTom Cooksey2010-03-261-6/+1
| | | * | | | | | | | Avoid having to create temporary QPixmaps when binding to textureTom Cooksey2010-03-264-13/+10
| | | * | | | | | | | Implement Texture-From-Pixmap using EGLImage extensions on X11/EGLTom Cooksey2010-03-266-37/+190
| | | * | | | | | | | Stabilize tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaintGabriel de Dietrich2010-03-261-3/+6
| | | * | | | | | | | QMetaObject::normalizeType: Fix parsing of type which contains "const" in namesOlivier Goffart2010-03-263-1/+19
| | | * | | | | | | | QMetaObject::normalizeType: fix uses of const and template.Olivier Goffart2010-03-264-1/+40
| | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2629-541/+4385
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Paintbuffer single frame profiling.Samuel Rødal2010-03-264-25/+400
| | | | * | | | | | | Optimized ARGB32PM on RGB16 blending with opacity using NEON.Samuel Rødal2010-03-261-5/+32
| | | | * | | | | | | Optimized SourceOver and 16 bit dest fetches, dest stores using NEON.Samuel Rødal2010-03-263-15/+134
| | | | * | | | | | | Optimized scaled/transformed image blending for ARGB32PM and RGB16 on RGB16.Samuel Rødal2010-03-267-419/+890
| | | | * | | | | | | Included ARM NEON optimizations from pixman in Qt.Samuel Rødal2010-03-2610-49/+2820
| | | | * | | | | | | Safeguard the colortable access when converting corrupted indexed8Gunnar Sletta2010-03-261-2/+2
| | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-26309-14542/+14361
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-2625-556/+555
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-2625-556/+555
| | | | | | |\ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix QItemDelegate::textRectangleEskil Abrahamsen Blomfeldt2010-03-261-1/+3
| | | * | | | | | | | | | | Synchronize rich text and plain text code paths in QStaticTextEskil Abrahamsen Blomfeldt2010-03-262-2/+40
| | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Fix bad mergeOlivier Goffart2010-03-251-15/+7
| | | * | | | | | | | | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-25284-13975/+13795
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fix wrong arguments order in a warning in QObject::moveToThreadOlivier Goffart2010-03-251-1/+1
| | | * | | | | | | | | | | Fix warnings and build on mingwThierry Bastian2010-03-258-497/+164
| | | * | | | | | | | | | | Fixes a deadlock with streaming in Phonon.unknown2010-03-251-6/+0
| | | * | | | | | | | | | | cetest build fixJoerg Bornemann2010-03-252-1/+4
| | | * | | | | | | | | | | cetest build fix for TCP sync connectionJoerg Bornemann2010-03-252-0/+24
| | | * | | | | | | | | | | Fixed QPrintPreview text drawing (visible in Assistant).Trond Kjernåsen2010-03-251-2/+7
| | | * | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-25234-3459/+2754
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | itemChange() is now called when transformation properties change.Yoann Lopes2010-03-253-7/+209
| | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-25228-3448/+2538
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | stabilize tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaintOlivier Goffart2010-03-251-0/+6
| | | | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-254-21/+83
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-244-21/+83
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Fix QLabel::sizeHint()Eskil Abrahamsen Blomfeldt2010-03-251-1/+4
| | | | * | | | | | | | | | | | | Fix QFontMetrics::height() and QFontMetrics autotestEskil Abrahamsen Blomfeldt2010-03-252-3/+3
| | | | | |_|/ / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | | Fix glyph advance on Mac/CarbonEskil Abrahamsen Blomfeldt2010-03-251-10/+43
| | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2433-163/+584
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Auto test for commit 4a4458d1cf5ec7885c6f63f739b7ee80c70ad211Gabriel de Dietrich2010-03-241-0/+30
| | | * | | | | | | | | | | | | Add QFont::ForceIntegerMetrics style strategy flagEskil Abrahamsen Blomfeldt2010-03-243-21/+53
* | | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-013-15/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Revert "adds a timeout option to QThreadPool::waitForDone();"Pierre Rossi2010-04-013-15/+7
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-3180-952/+1012
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix compilation on Windows: forgot to change one toTime_tHelperThiago Macieira2010-03-311-1/+1
| * | | | | | | | | | | | | | handle qt-format PO flagsOswald Buddenhagen2010-03-311-1/+24
| * | | | | | | | | | | | | | handle encoding of PO filesOswald Buddenhagen2010-03-317-135/+218
| * | | | | | | | | | | | | | make variable naming politically correct :-DOswald Buddenhagen2010-03-311-4/+4
| * | | | | | | | | | | | | | add Plural-Forms header in PO writerOswald Buddenhagen2010-03-3111-34/+74
| * | | | | | | | | | | | | | simplify arabic plural ruleOswald Buddenhagen2010-03-311-1/+1
| * | | | | | | | | | | | | | don't mark untranslated messages as fuzzy in PO filesOswald Buddenhagen2010-03-315-12/+8