summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-306-5/+16
|\
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-307-9/+91
| |\
| | * Hack .pro files on windows to define QT_NO_EGLTom Cooksey2010-03-304-0/+6
| * | Support the pen set on the painter in QStaticText when using rich textEskil Abrahamsen Blomfeldt2010-03-301-0/+5
| * | Fix setting font for QStaticText on Linux and MacEskil Abrahamsen Blomfeldt2010-03-301-5/+5
* | | Fix QStaticText test on MacEskil Abrahamsen Blomfeldt2010-03-301-5/+5
| |/ |/|
* | Fix QDate::isLeapYear() for years < 1John Layt2010-03-302-9/+46
* | One more test for chinese codecsOlivier Goffart2010-03-301-0/+39
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-3076-1273/+5686
|\
| * QScript: More missing APIShimOlivier Goffart2010-03-291-0/+4
| * QScriptEngine: Fix reentrency involving creation and desctructions of QScript...Olivier Goffart2010-03-294-24/+101
| * Work-around Symbian 10.1's broken egl.hTom Cooksey2010-03-292-4/+9
| * Add some #warnings to debug Symbian EGL build failureTom Cooksey2010-03-291-0/+24
| * Don't detect EGLImage presence by testing function pointersTom Cooksey2010-03-291-2/+2
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2931-101/+457
| |\
| | * QVarLenghtArray: add some API to be consistant to QVectorOlivier Goffart2010-03-293-1/+63
| | * Don't try to resolve EGLImage function pointers if they are definedTom Cooksey2010-03-291-0/+2
| | * Change ORs to ANDs when checking EGLImage extension definesTom Cooksey2010-03-292-4/+4
| | * Protect EGLImage function definitions in #ifdefTom Cooksey2010-03-291-0/+2
| | * Fix a bug in greek shaping causing infinite loopsLars Knoll2010-03-263-13/+90
| | * Define QT_NO_EGL in configure.exeTom Cooksey2010-03-261-0/+4
| | * improve mingw 64 bit supportThierry Bastian2010-03-261-1/+1
| | * Fix build on WindowsTom Cooksey2010-03-261-0/+1
| | * Round instead of ceil font metrics when ForceIntegerMetrics is enabledTor Arne Vestbø2010-03-261-24/+24
| | * 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
| * | | Implement proper QStaticText support in QPaintBufferEskil Abrahamsen Blomfeldt2010-03-292-14/+29
| * | | Make QStaticText layout lazyEskil Abrahamsen Blomfeldt2010-03-295-30/+46
| * | | Change QStaticText::setMaximumSize() to setTextWidth()Eskil Abrahamsen Blomfeldt2010-03-296-89/+109
| * | | Respect QPainter::pen() in QPainter::drawStaticText()Eskil Abrahamsen Blomfeldt2010-03-293-4/+103
| | |/ | |/|
| * | 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
| |\ \ \ \ \