summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-2416-136/+406
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed some potential index-out-of-bounds issues in QImage. Fixed autotest failure in fillRect_stretchToDeviceMode Adding a known issue for VC2010 64 bit Added a note to desupport VC2010 64-bit Normalize integers when calling glVertexAttribPointer() Add an implementation of comp_func_solid_SourceOver_neon() with Neon. Fix the casts of qdrawhelper_sse2 Add a SSE2 implementation of comp_func_solid_SourceOver() Add a SSE2 version of comp_func_SourceOver() Fixed missing copy of raster pixmap data after change fb76a872e20bd. Fixed QPixmap::toImage() bug introduced in fb76a872e20bd. Optimized sub-rect copying / painting of QPixmaps. Fixed crash in the fast blend functions for raster
| * Fixed some potential index-out-of-bounds issues in QImage.Kim Motoyoshi Kalland2010-06-242-6/+24
| | | | | | | | | | | | | | | | | | Added color table bounds checks when converting a color indexed image to a different pixel format. Fixed an off-by-one error in the color table bounds check in QImage::setPixel(). Fixed an autotest that was setting pixel values out of bounds. Reviewed-by: Gunnar
| * Fixed autotest failure in fillRect_stretchToDeviceModeSamuel Rødal2010-06-241-1/+1
| | | | | | | | | | | | Swapping the length and color arguments to qt_memfill is a bad idea. Reviewed-by: Benjamin Poulain
| * Adding a known issue for VC2010 64 bitThierry Bastian2010-06-241-0/+8
| | | | | | | | Task-Number: QTBUG-11445
| * Added a note to desupport VC2010 64-bitThierry Bastian2010-06-241-2/+4
| | | | | | | | | | | | VC2010 has a bug that makes optimized 64-bit code crash. Task-Number: QTBUG-11445
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-2412-128/+370
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Normalize integers when calling glVertexAttribPointer() Add an implementation of comp_func_solid_SourceOver_neon() with Neon. Fix the casts of qdrawhelper_sse2 Add a SSE2 implementation of comp_func_solid_SourceOver() Add a SSE2 version of comp_func_SourceOver() Fixed missing copy of raster pixmap data after change fb76a872e20bd. Fixed QPixmap::toImage() bug introduced in fb76a872e20bd. Optimized sub-rect copying / painting of QPixmaps. Fixed crash in the fast blend functions for raster
| | * Normalize integers when calling glVertexAttribPointer()Rhys Weatherley2010-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QGLShaderProgram::setAttributeArray() is used with a type like GL_UNSIGNED_BYTE, it is normally going to be a value that should be normalized to the range 0..1. But the function wasn't normalizing, which led to errors in programs that used per-vertex colors with the 4ub representation. Reviewed-by: Sarah Smith
| | * Add an implementation of comp_func_solid_SourceOver_neon() with Neon.Benjamin Poulain2010-06-233-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function comp_func_solid_SourceOver_neon() is use extensively by WebKit via the calls to fillRect() of QPainter(). Implementing the function with Neon provides some performance improvement (around 175% of the previous speed). Reviewed-by: Samuel Rødal
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-239-126/+322
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix the casts of qdrawhelper_sse2 Add a SSE2 implementation of comp_func_solid_SourceOver() Add a SSE2 version of comp_func_SourceOver() Fixed missing copy of raster pixmap data after change fb76a872e20bd. Fixed QPixmap::toImage() bug introduced in fb76a872e20bd. Optimized sub-rect copying / painting of QPixmaps. Fixed crash in the fast blend functions for raster
| | | * Fix the casts of qdrawhelper_sse2Benjamin Poulain2010-06-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I did erroneous cast by mistake, the code should ensure the pointer are on 32 bits integers. Reviewed-by: Andreas Kling Reviewed-by: Samuel Rødal
| | | * Add a SSE2 implementation of comp_func_solid_SourceOver()Benjamin Poulain2010-06-232-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is used quite a lot by WebKit animations, the SSE2 implementation is twice as fast in those uses cases. Reviewed-by: Andreas Kling Reviewed-by: Samuel Rødal
| | | * Add a SSE2 version of comp_func_SourceOver()Benjamin Poulain2010-06-232-61/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement a version of comp_func_SourceOver() with SSE2. This gives a performance boost of 11% on some WebKit animations. Two new macros were added to simplify the implementation of the different blending primitives: BLEND_SOURCE_OVER_ARGB32_SSE2() and BLEND_SOURCE_OVER_ARGB32_WITH_CONST_ALPHA_SSE2() Reviewed-by: Samuel Rødal
| | | * Fixed missing copy of raster pixmap data after change fb76a872e20bd.Samuel Rødal2010-06-232-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's expected that copy actually does a deep copy of the image data. Because QRasterPixmapData::fromImage() will just use the source image as is in this case we need to do a deep copy of the QImage. Reviewed-by: Trond
| | | * Fixed QPixmap::toImage() bug introduced in fb76a872e20bd.Samuel Rødal2010-06-231-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The alpha channel we get from XGetImage might not be saturated for opaque pixmaps. Reviewed-by: Trond
| | | * Optimized sub-rect copying / painting of QPixmaps.Samuel Rødal2010-06-237-62/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevented downloading of the whole XImage by introducing new QPixmapData::toImage() overload taking a sub-rect. Also avoid an additional copy by simply taking ownership of the XImage data when the XImage format matches the QImage format. Reviewed-by: Trond
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-231-1/+5
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed crash in the fast blend functions for raster
| | | | * Fixed crash in the fast blend functions for rasterGunnar Sletta2010-06-231-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The blend functions don't work when the scaling factor goes beyond 65536, so abort early. Strictly speaking the scale factor comes from targetWidth / sourceWidth, so this catches a bit more cases. Reviewed-by: Kim Task: http://bugreports.qt.nokia.com/browse/QTBUG-9437
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-248-5/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2e
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-248-5/+46
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2e
| | * | | | Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2eSimon Hausmann2010-06-238-5/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Build fixes for package builds * Fix build with QT_NO_COMBOBOX * Upstream David's doc fix
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-2426-374/+1128
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Abort open early if network session is in the process of openning. Cherry pick fix for MOBILITY-800 from Qt Mobility. Cherry pick fix for MOBILITY-1063 from Qt Mobility. Cherry pick fix for QTMOBILITY-253 from Qt Mobility. Cherry pick fix for MOBILITY-1063 from Qt Mobility. Cherry pick fix for MOBILITY-965 from Qt Mobility. Cherry pick fix for MOBILITY-800 from Qt Mobility. Cherry pick fix for MOBILITY-853 from Qt Mobility. Cherry pick fix for MOBILITY-1047 from Qt Mobility. Merge bearermanagement changes from Qt Mobility. Cherry pick fix for MOBILITY-1031 from Qt Mobility. Cherry pick fix for MOBILITY-938 from Qt Mobility. Cherry pick fix for QTMOBILITY-240 from Qt Mobility. Make QtFontFamily::symbol_checked a bitfield.
| * | | | | Abort open early if network session is in the process of openning.Aaron McCarthy2010-06-242-5/+20
| | | | | |
| * | | | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-243-70/+61
| | | | | | | | | | | | | | | | | | | | | | | | 21abc07dc396f08c888bf3cac96b535cc296cb00
| * | | | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | 4713262c16cb3eba1f4beccb6962a1ae210479c0
| * | | | | Cherry pick fix for QTMOBILITY-253 from Qt Mobility.Aaron McCarthy2010-06-245-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | f3d7f49b7f6975cbfa65adeb10b281e2b37172ce
| * | | | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-242-57/+96
| | | | | | | | | | | | | | | | | | | | | | | | 37ad80914f7acb8d4f3364d78e75d48cd14e8e2a
| * | | | | Cherry pick fix for MOBILITY-965 from Qt Mobility.Aaron McCarthy2010-06-243-10/+147
| | | | | | | | | | | | | | | | | | | | | | | | 50de830ded2dcc1c6b4d8be71428d9a2bfed6ae7
| * | | | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-243-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | a05504d2a0c643c6f253527f07bcc0dba8a799b4
| * | | | | Cherry pick fix for MOBILITY-853 from Qt Mobility.Aaron McCarthy2010-06-242-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | 256e67963c4cb0fc150e6c47193e7c9b17296611
| * | | | | Cherry pick fix for MOBILITY-1047 from Qt Mobility.Aaron McCarthy2010-06-241-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | 4f74cd44d77349759096bed091913b188a9167e4
| * | | | | Merge bearermanagement changes from Qt Mobility.Aaron McCarthy2010-06-2410-8/+358
| | | | | | | | | | | | | | | | | | | | | | | | cba220f177154428d6103a93a819668be689a591
| * | | | | Cherry pick fix for MOBILITY-1031 from Qt Mobility.Aaron McCarthy2010-06-243-22/+29
| | | | | | | | | | | | | | | | | | | | | | | | 7e8b55524bd8a00e49e11103e8c8091e1e59e612
| * | | | | Cherry pick fix for MOBILITY-938 from Qt Mobility.Aaron McCarthy2010-06-246-159/+223
| | | | | | | | | | | | | | | | | | | | | | | | 216f4016d1b447d51630086afca179df11fd6997
| * | | | | Cherry pick fix for QTMOBILITY-240 from Qt Mobility.Aaron McCarthy2010-06-242-62/+88
| | | | | | | | | | | | | | | | | | | | | | | | c84a6d828bcb7f66d1ac06e1a7a84c5a8ba9cec4
| * | | | | Make QtFontFamily::symbol_checked a bitfield.Andreas Kling2010-06-241-1/+1
|/ / / / / | | | | | | | | | | | | | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-2314-33/+68
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: We need to swallow the event, otherwise it might pop up several times. Set the item data thru the model, so we actually emit dataChanged. There where still references to the old Assistant. Newly created folders in QFileDialog are disabled on Cocoa. don't remove the path from the name of included files add some comments remove support for QMAKE_POST_INCLUDE_FILES remove unused function fix prompt() stdin safety check Improve text performance with QtWebKit in Qt 4.7 Removed support for static linking of QtWebKit. When a drag is finished with on Mac, then it should delete itself
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-231-2/+2
| |\ \ \ \ | | |/ / /
| * | | | We need to swallow the event, otherwise it might pop up several times.kh12010-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: kh
| * | | | Set the item data thru the model, so we actually emit dataChanged.kh12010-06-233-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10629 Reviewed-by: kh
| * | | | There where still references to the old Assistant.kh12010-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11651
| * | | | Newly created folders in QFileDialog are disabled on Cocoa.Prasanth Ullattil2010-06-231-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a newly created folder in the current path, we were returning NO for the "shouldShowFilename" callback. This patch moves the check for directories to the begining. Task-number: QTBUG-11532 Reviewed-by: Carlos Duclos
| * | | | don't remove the path from the name of included filesOswald Buddenhagen2010-06-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is not done for the top-level file, either. this is minimally behavior-incompatible, but anyone relying on the old behavior (and thus not using $$basename()) should be shot anyway. :) Reviewed-by: joerg
| * | | | add some commentsOswald Buddenhagen2010-06-231-2/+2
| | | | |
| * | | | remove support for QMAKE_POST_INCLUDE_FILESOswald Buddenhagen2010-06-232-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | google has no mention of it except for a single orphaned instance in our own source code => trash. Reviewed-by: joerg
| * | | | remove unused functionOswald Buddenhagen2010-06-231-4/+0
| | | | |
| * | | | fix prompt() stdin safety checkOswald Buddenhagen2010-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: joerg
| * | | | Improve text performance with QtWebKit in Qt 4.7Simon Hausmann2010-06-231-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented the straight string-to-glyph conversion in the core text font engine, that bypasses the shaping. This is used by the fast text code path in QtWebKit. Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * | | | Removed support for static linking of QtWebKit.Simon Hausmann2010-06-233-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Static linking of WebKit is not going to be supported anymore in Qt 4.7, so this commit makes sure it's mentioned in the documentation and that configure disables WebKit if static linking of Qt is requested. Reviewed-by: Andy Shaw <qt-info@nokia.com>
| * | | | When a drag is finished with on Mac, then it should delete itselfAndy Shaw2010-06-232-0/+6
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On other platforms then when a drag is finished then it cleans up by calling setMimeData(0) and deleteLater() on the drag object, this didn't happen before on the Mac which meant it did not delete the QDrag objects until the parent of them was deleted thus taking up memory. Task-number: QTBUG-11613 Reviewed-by: Prasanth
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-235-0/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Provide the Webkit Qml plugin with a UID3 on Symbian Provide Qml plugins with UID3s on Symbian Fix "missing store_build" errors
generated by cgit v0.12 at 2025-08-21 03:37:07 (GMT)