summaryrefslogtreecommitdiffstats
path: root/src
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-3160-1287/+5266
|\
| * Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-3116-74/+388
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-31331-4852/+10351
| |\ \
| | * | Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem.Alexis Menard2010-03-313-0/+39
| | * | Micro optimization after feedback from Jan-Arve.Alexis Menard2010-03-311-1/+1
| | * | Show only one dialog when using QFileDialog on Mac.Alexis Menard2010-03-311-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-3062-1219/+5135
| | |\ \
| | | * | Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7Thiago Macieira2010-03-301-0/+2
| | | * | Fix bad merge from 4.6.Thiago Macieira2010-03-301-2/+4
| | | * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-302110-89046/+301191
| | | |\ \
| | | | * \ Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-30150-2746/+5190
| | | | |\ \
| | | | * \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-302-1/+5
| | | | |\ \ \
| | | | | * | | Hack .pro files on windows to define QT_NO_EGLTom Cooksey2010-03-301-0/+1
| | | | | * | | Fix QDate::isLeapYear() for years < 1John Layt2010-03-301-1/+4
| | | | * | | | 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
| | | | |/ / /
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-3054-1212/+5099
| | | | |\ \ \
| | | | | * | | QScript: More missing APIShimOlivier Goffart2010-03-291-0/+4
| | | | | * | | QScriptEngine: Fix reentrency involving creation and desctructions of QScript...Olivier Goffart2010-03-293-24/+80
| | | | | * | | 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-2921-94/+342
| | | | | |\ \ \
| | | | | | * | | QVarLenghtArray: add some API to be consistant to QVectorOlivier Goffart2010-03-292-1/+50
| | | | | | * | | Don't try to resolve EGLImage function pointers if they are definedTom Cooksey2010-03-291-0/+2
| | | | | * | | | Implement proper QStaticText support in QPaintBufferEskil Abrahamsen Blomfeldt2010-03-292-14/+29
| | | | | * | | | Make QStaticText layout lazyEskil Abrahamsen Blomfeldt2010-03-294-29/+45
| | | | | * | | | Change QStaticText::setMaximumSize() to setTextWidth()Eskil Abrahamsen Blomfeldt2010-03-295-70/+77
| | | | | * | | | Respect QPainter::pen() in QPainter::drawStaticText()Eskil Abrahamsen Blomfeldt2010-03-292-4/+13
| * | | | | | | | Total makeover of SVG image readeraavit2010-03-312-67/+106
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | 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-262-13/+54
| * | | | | | | 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-2641-1063/+4719
| |\ \ \ \ \ \ \
| | * | | | | | | 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
| | * | | | | | | QMetaObject::normalizeType: Fix parsing of type which contains "const" in namesOlivier Goffart2010-03-261-1/+2
| | * | | | | | | QMetaObject::normalizeType: fix uses of const and template.Olivier Goffart2010-03-261-1/+3
| | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2627-532/+4256
| | |\ \ \ \ \ \
| | | * | | | | | Paintbuffer single frame profiling.Samuel Rødal2010-03-263-16/+310
| | | * | | | | | 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-269-49/+2781
| | | * | | | | | 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-26190-3827/+8564
| | | |\ \ \ \ \ \