summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |\
| | * | \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-268-38/+95
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Don't specify a BottomToTop scan line direction for YUV frames.Andrew den Exter2010-03-261-6/+22
| | | * | Support expanding aspect ratio in direct show video window control.Andrew den Exter2010-03-264-30/+43
| | | * | Support the Expanding aspect ratio mode in the gstreamer window control.Andrew den Exter2010-03-263-2/+30
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-263-7/+29
| | |\ \ \
| | | * | | specify the configuration's purpose based on security mode of network.Lorn Potter2010-03-263-7/+29
| * | | | | 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
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-03-25284-13972/+13784
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | Use QTRY_COMPARE after QTest::qWaitForWindowShown()Kent Hansen2010-03-251-1/+1
| | * | Use the new memory cost reporting API in QtScript Custom Class exampleKent Hansen2010-03-253-2/+30
| | * | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-255-3/+81
| | * | Add experimental support for StaticContents in Mac OS X.Fabien Freling2010-03-251-1/+18
| | * | Fix misspelling in function name.Fabien Freling2010-03-251-2/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-25226-3447/+2531
| | |\ \
| | | * \ Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-25226-3447/+2531
| | | |\ \ | | |_|/ / | |/| | |
| | * | | don't just return the first key here.Lorn Potter2010-03-251-3/+0
| | |/ /
| | * | Fix CI sytem build breakage.Morten Johan Sørvig2010-03-251-0/+0
| | * | Fix crash.Aaron McCarthy2010-03-251-1/+1
| | * | Compile with QT_NO_NETWORKINTERFACE defined.Aaron McCarthy2010-03-2520-24/+67
| | * | Don't emit signals in constructor.Aaron McCarthy2010-03-252-4/+11
| | * | Remove unused code.Aaron McCarthy2010-03-252-212/+113
| | * | fix multiple promps for keychain access when connecting to wifi networkLorn Potter2010-03-252-39/+111
| | * | not all interfaces should be activeLorn Potter2010-03-251-2/+2
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-03-24146-1017/+4133
| | |\ \
| | | * | Update changelogThiago Macieira2010-03-241-0/+10
| | | * | Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2414-38/+43
| | | |\ \
| | | * | | Fix qcombobox:flaggedItems autotest failure.Thiago Macieira2010-03-242-11/+10
| | | * | | Wrong value for PM_ScrollBarExtent on Windows XP.Prasanth Ullattil2010-03-241-1/+1
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-2416-213/+435
| | | |\ \ \
| | | | * | | Do not move keyboard focus to invisible windows on X11.Denis Dzyubenko2010-03-242-6/+2
| | | | * | | Do not use _NET_ACTIVE_WINDOW for nonmanaged windows.Denis Dzyubenko2010-03-242-2/+3
| | | | * | | Revert "Revert "Make QWidget::activateWindow() NET window manager aware.""Denis Dzyubenko2010-03-243-1/+25