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-2523-147/+486
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed autotest failure in QPainter::setOpacity when NEON is used. Fix compilation when configured with -no-xrender Add a new (internal) flag QGraphicsItem::ItemStopsClickFocusPropagation. 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 autotest failure in QPainter::setOpacity when NEON is used.Samuel Rødal2010-06-251-6/+10
| | | | | | | | | | | | | | Be more lenient in the comparison, rounding errors might lead to slightly different values. Reviewed-by: Trond
| * Fix compilation when configured with -no-xrenderGunnar Sletta2010-06-251-1/+1
| | | | | | | | Reviewed-by: Eskil
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-2421-140/+475
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add a new (internal) flag QGraphicsItem::ItemStopsClickFocusPropagation. 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
| | * Add a new (internal) flag QGraphicsItem::ItemStopsClickFocusPropagation.Bjørn Erik Nilsen2010-06-245-4/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag allows you to create a non-focusable item that can be clicked on without changing the focus. This is also possible to achieve by using focus scopes / panels, however the implementation is then way more complex. Thew new flag is tailored for simple uses cases where you simply want to stop the propagation and nothing more. Auto test included. Task-number: QT-3499 Reviewed-by: yoann
| | * 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/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-2518-43/+656
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use custom static scopes to improve QML/JavaScript performance qmake: Fix CONFIG += exceptions_off with the MSVC project generator, take 2.
| * | | | | | Use custom static scopes to improve QML/JavaScript performanceKent Hansen2010-06-2514-37/+652
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces a new internal JS object type, QScriptStaticScopeObject, that enables the JS compiler to make more aggressive optimizations of scoped property access. QScriptStaticScopeObject registers all its properties in a symbol table that the JS compiler has access to. If the compiler finds the property in the symbol table, it will generate the fast index-based op_{get,put}_scoped_var bytecodes, rather than the dynamic (slow) op_resolve and friends. If the compiler _doesn't_ find the property in the symbol table, it infers that it's safe to skip the scope object when later resolving the property, which will also improve performance (see op_resolve_skip bytecode). QScriptStaticScopeObject is only safe to use when all relevant properties are known at JS compile time; that is, when a function that has the static scope object in its scope chain is compiled. It's up to the user of the class (e.g. QtDeclarative) to ensure that this constraint is not violated. The API for constructing QScriptStaticScopeObject instances is not public; it lives in QScriptDeclarativeClass for now, an internal class exported for the purpose of QML. The instance is returned as a QScriptValue and can be manipulated like any other JS object (e.g. by QScriptValue::setProperty()). The other part of this commit utilizes QScriptStaticScopeObject in QtDeclarative in the two major places where it's currently possible: 1) QML disallows adding properties to the Global Object. Furthermore, it's not possible for QML IDs and properties to "shadow" global variables. Hence, a QScriptStaticScopeObject can be used to hold all the standard ECMA properties, and this scope object can come _before_ the QML component in the scope chain. This enables binding expressions and scripts to have optimized (direct) access to e.g. Math.sin. 2) Imported scripts can have their properties (resulting from variable declarations ("var" statements) and function declarations) added to a static scope object. This enables functions in the script to have optimized (direct) access to the script's own properties, as well as to global properties such as Math. With this change, it's no longer possible to delete properties of the Global Object, nor delete properties of an imported script. It's a compromise we make in order to make the optimization safe. Task-number: QTBUG-8576 Reviewed-by: Aaron Kennedy Reviewed-by: Olivier Goffart Reviewed-by: Jedrzej Nowacki
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-254-6/+4
| |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qmake: Fix CONFIG += exceptions_off with the MSVC project generator, take 2.
| * | | | | | qmake: Fix CONFIG += exceptions_off with the MSVC project generator, take 2.Jocelyn Turcotte2010-06-244-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous patch caused the pch header to be compiled without exception handling since the compilertool for the pch compilation do not get its options filled from the compiler flags. This patch instead set the value to off before calling parseOptions. This also reverts commit 73fa311f67b21c9b897de0196d3b8227f27d828f. Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2417-141/+280
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 2f598e9b7b376d851fe089bc1dc729bcf0393a06 Moved the QML WebKit integration into QtWebKit.sis
| * | | | | | Updated WebKit to 2f598e9b7b376d851fe089bc1dc729bcf0393a06Simon Hausmann2010-06-2415-128/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed QML packaging || <https://webkit.org/b/39304> || Add an inlineCapacity template parameter to ListHashSet and use it to shrink the positioned object list hash set. || || <https://webkit.org/b/39309> || Allocate the m_preloads list hash set dynamically and free it when done. || || <https://webkit.org/b/33150> || Do not render the full frame when there is some elements with fixed positioning ||
| * | | | | | Moved the QML WebKit integration into QtWebKit.sisSimon Hausmann2010-06-243-14/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-245-10/+41
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Manipulate buffer position via 'pPos' in peek() No more enter & leave events after a popup menu is closed on Windows Child windows shown automatically when their parent is shown(Cocoa). QKeyEvent::text() inconsistency between Linux and Mac
| * | | | | Manipulate buffer position via 'pPos' in peek()Andreas Kling2010-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| * | | | | No more enter & leave events after a popup menu is closed on WindowsPrasanth Ullattil2010-06-241-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use the TrackMouseEvent() to keep track of enter and leave messages. Upon receiving a WM_MOUSELEAVE, the effect of that function call is over, we need to call it again if we need more messages. This was not done when we close a popup because of mouse click outside. Task-number: QTBUG-11582 Reviewed-by: Bradley T. Hughes
| * | | | | Child windows shown automatically when their parent is shown(Cocoa).Prasanth Ullattil2010-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While setting up the stacking order for child windows, their hidden state was never taken into consideration. Task-number: QTBUG-11239 Reviewed-by: Richard Moe Gustavsen
| * | | | | QKeyEvent::text() inconsistency between Linux and MacPrasanth Ullattil2010-06-242-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a key event triggered by the cursor keys, QKeyEvent::text() returns char with value 0x14 or similar. This patch (Cocoa only)will remove text from all key events for the unicode range 0xF700-0xF747. This is part of the corporate unicode range used by apple for keyboard function keys. [http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CORPCHAR.TXT] Task-number: QTBUG-11225 Reviewed-by: Bradley T. Hughes
* | | | | | 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