summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'integration/qt-4.7-from-4.6' into 4.7Olivier Goffart2010-03-313-3/+3
|\
| * Revert 4.6 commits that shouldn't be in 4.7.Thiago Macieira2010-03-317-1/+254
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-3110-252/+16
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-3110-255/+18
| | |\
| | | * Revert "Add a children private property needed for QML to support QGraphicsOb...Alexis Menard2010-03-316-245/+0
| | | * Revert "struct -> class, it's better."Alexis Menard2010-03-311-2/+1
| | | * Revert "Add NOTIFY to size property so QML bindings are working fine."Alexis Menard2010-03-312-9/+1
| | | * Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry chan...Alexis Menard2010-03-312-4/+6
| | | * Revert "Add a a layout property in QGraphicsWidget."Alexis Menard2010-03-312-3/+0
| | | * Add a workaround for a bug in Mac filesystem watcher.Alexis Menard2010-03-301-1/+1
| | * | QS60Style: Custom QPushButton: Heigth is calculated wronglySami Merila2010-03-301-1/+1
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-305-19/+41
| |\ \ \ | | |/ /
| * | | Merge remote branch 'origin/4.7' into qt-4.7-from-4.6Thiago Macieira2010-03-302-1/+19
| |\ \ \
| * \ \ \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-2932-180/+589
| |\ \ \ \
* | | | | | 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
* | | | | | 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-30298-5160/+10977
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-301-0/+1
| |\ \ \ \ \
| | * | | | | Hack .pro files on windows to define QT_NO_EGLTom Cooksey2010-03-301-0/+1
| * | | | | | 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-3029-1111/+2093
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | 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
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-295-29/+66
| | |\ \ \ \
| | | * | | | 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
| | | * | | | 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-2625-1003/+1905
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Implement Texture-From-Pixmap using EGLImage extensions on X11/EGLTom Cooksey2010-03-262-2/+31
| | * | | | | 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
| | | |/ / / | | |/| | |
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-2613-487/+1491
| | |\ \ \ \
| | | * | | | 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-266-49/+140
| | | * | | | 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-2659-721/+892
| | | |\ \ \ \
| | | * | | | | Fix QItemDelegate::textRectangleEskil Abrahamsen Blomfeldt2010-03-261-1/+3
| | * | | | | | Synchronize rich text and plain text code paths in QStaticTextEskil Abrahamsen Blomfeldt2010-03-261-2/+4
| | | |/ / / / | | |/| | | |
| | * | | | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-2554-233/+572
| | |\ \ \ \ \
| | * | | | | | Fix warnings and build on mingwThierry Bastian2010-03-251-470/+141
generated by cgit v0.12 at 2024-10-24 18:20:06 (GMT)