summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-2613-522/+383
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-2613-522/+383
| | | |\
| | * | \ 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
| | * | | 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-261-2/+4
| |_|_|/ |/| | |
* | | | Merge remote branch 'origin/4.7' into 4.7Olivier Goffart2010-03-25173-3290/+8122
|\ \ \ \ | | |/ / | |/| |
| * | | QtScript: Add API for reporting additional memory costsKent Hansen2010-03-254-3/+62
| * | | 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-2579-1242/+1127
| |\ \ \
| | * \ \ Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2579-1242/+1127
| | |\ \ \ | | | | |/ | | | |/|
| * | | | don't just return the first key here.Lorn Potter2010-03-251-3/+0
| |/ / /
| * | | Fix crash.Aaron McCarthy2010-03-251-1/+1
| * | | Compile with QT_NO_NETWORKINTERFACE defined.Aaron McCarthy2010-03-2515-18/+40
| * | | 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-2483-712/+852
| |\ \ \
| | * \ \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-2410-24/+24
| | |\ \ \
| | * | | | 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-2412-200/+287
| | |\ \ \ \
| | | * | | | 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-241-1/+2
| | | * | | | Revert "Revert "Make QWidget::activateWindow() NET window manager aware.""Denis Dzyubenko2010-03-243-1/+25
| | | * | | | Give 1-pixel splitters a larger grab areaJens Bache-Wiig2010-03-242-1/+32
| | | * | | | Optimization in QJpegHandler to reduce overheadZeno Albisser2010-03-242-188/+215
| | | * | | | QtScript: Add QObjectWrapOption for not exposing slotsKent Hansen2010-03-243-1/+4
| | | * | | | QtScript: Add more missing API shimsKent Hansen2010-03-242-4/+9
| | * | | | | doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-246-120/+142
| | |/ / / /
| | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-246-183/+67
| | |\ \ \ \
| | | * | | | Wrong position for foucs ring when used in QMacNativeWidget.Prasanth Ullattil2010-03-241-2/+3
| | | * | | | Fix compile error with QT_NO_HTTPTasuku Suzuki2010-03-241-0/+8
| | | * | | | Add a check to make sure QTranslator doesn't load a directory.David Sansome2010-03-241-2/+2
| | | * | | | Revert "Optimized QLocale to access system locale on demand."Morten Johan Sørvig2010-03-243-179/+54