summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbianv4.7.0Juha Turunen2010-09-102-134/+136
| | | | | | | | | | | | | | | The patch fixes the hanging issues on some Symbian devices that occurs while retrieving certificates from the Symbian certificate store. The hanging was caused by the certificate info array not being closed before exiting the thread. This alone wouldn't make the existing implementation work, so the patch replaces it with a pure Symbian style implementation which doesn't seem to be affected (probably some OpenC threads issue). Merge-request: 808 Reviewed-by: Shane Kearns Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Task: QTBUG-13033 (cherry picked from commit 5342be5ceffc84b56476fff57dd7d5e1bbfeb471)
* Add exception barrier to QCertificateRetriever::RunL()Shane Kearns2010-09-102-3/+9
| | | | | | | | This translates stl exceptions into Symbian OS Leaves, to prevent an assertion failure in the active scheduler. Reviewed-by: mread (cherry picked from commit 4f8ec542b123399574d2e509fa99f4bd66a34e25)
* QtWebKit: Update tag files to match the same content on qtwebkit.gitJocelyn Turcotte2010-09-092-2/+2
| | | | | | | | | | | | NOTE: Some patches have been made in the 4.7.0 branch for src/3rdparty/webkit that are not available upstream. This shouldn't have happened, however these patches mostly address issues regarding builds of QtWebKit inside the Qt source tree so it doesn't matter so much regarding source packages. Reviewed-by: Simon Hausmann (cherry picked from commit cb23007c0e04e8d23b426ca1a3672f70282012c7)
* QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.Jocelyn Turcotte2010-09-092-1/+13
| | | | | | | | | | http://bugreports.qt.nokia.com/browse/QTBUG-13279 Sha1 on qtwebkit.git: 460b651cbe4f6994b492ff08614e57b0e31a24c8 Reviewed-by: Simon Hausmann (cherry picked from commit d027395181d3e0c5796340ff87f2cddb41b93d29)
* QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.Jocelyn Turcotte2010-09-091-4/+4
| | | | | | | | | | http://bugreports.qt.nokia.com/browse/QTBUG-13279 Sha1 on qtwebkit.git: 8c902b12f771829cecd22edb7742636c8de816c2 Reviewed-by: Simon Hausmann (cherry picked from commit b080eccb98ab861d6625b1980b323a62bed3d50a)
* Revert "let WebKit inject itself into the qt configuration"Jason McDonald2010-09-083-8/+2
| | | | This reverts commit b35310bba20f0c33a61b03ea4eec6108ec873a7c.
* Revert "fix qt_webkit_version.pri install for in-Qt builds"Jason McDonald2010-09-081-21/+13
| | | | This reverts commit 2ed8ae55ea8e37060538bd45276e5f72e98f36c4.
* Revert "Fixed incorrect Symbian scoping."Jason McDonald2010-09-081-2/+2
| | | | This reverts commit bd9e8679703dfdd63f58be9ee29b73e73a0c3774.
* QS60Style: Itemviews are drawn incorrectlySami Merila2010-09-071-1/+5
| | | | | | | | | | | | | | | | | | When running QS60Style on hardware, all the itemview items without any special background (i.e. not "pressed", not "highlighted", not "alternate") are drawn with "pressed button" graphics. This is due that the internal drawing function gets called without any enum value set and it seem to pick the second enumeration constant from theme element list. The enumeration constant is not defined to match to any integer value. As a solution, style will not call the drawing function when theme element is not defined. Task-number: QTBUG-11601 Reviewed-by: Liang Qi (cherry picked from commit 1ec0155c191e2818f56815ee4ddbf5d8982f1267)
* Change to commercial license headers in preparation for release.Jason McDonald2010-09-073718-48404/+48404
| | | | Reviewed-by: Trust Me
* Recreate Qt 4.7.0 def files over Qt 4.6.3Joona Petrell2010-09-0712-3890/+3795
|
* Fixed incorrect Symbian scoping.axis2010-09-071-2/+2
| | | | | The missing install functionality is only true for mmp based systems. (cherry picked from commit 08c34bfec8880600138846bb895e82f69cb3f92c)
* fix qt_webkit_version.pri install for in-Qt buildsOswald Buddenhagen2010-09-071-13/+21
| | | | | | | | | always add the target, even if building inside Qt - as opposed to the headers and libraries, there are no rules for that coming from qbase.pri. Task-number: QTBUG-13306 (cherry picked from commit a37dfcfdaa8029f25217fdec6dd6ec1a46929af2)
* let WebKit inject itself into the qt configurationOswald Buddenhagen2010-09-073-2/+8
| | | | | | | | | i.e., don't explicitly deal with qt_webkit_version.pri outside of the webkit source directory. Task-number: QTBUG-12379 Reviewed-by: Simon Hausmann (cherry picked from commit b5b6cbb477b50c582d545b0e5e3a04626834e7e2)
* Fix remote crash in delivering D-Bus calls with too few argumentsThiago Macieira2010-09-071-0/+3
| | | | | | | Patch by Christoph Feck. Task-number: QTBUG-13348 Reviewed by me (cherry picked from commit 4b7346a4bd30705ab5910d448ec56daa6568aa90)
* Add three new style-hints to QFont to match CSS' generic font familiesTor Arne Vestbø2010-09-066-1/+34
| | | | | | | | | The defaults were chosen to match major web browsers. See: http://xhva.net/log/?p=160 Reviewed-by: Simon Hausmann (cherry picked from commit 6d5655089fa4e2231a1a8edc98ecbb6b29e344e1)
* Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.Aaron McCarthy2010-09-063-10/+9
| | | | | Wrap new APIs in ifndef QT_MOBILITY_BEARER. (cherry picked from commit 7e4807fed07e4c96086af00338601223b3353d29)
* compilation with QT_NO_DEPRECATEDJason McDonald2010-09-061-0/+2
| | | | | | | | | Reviewed-by: Andreas Kling (cherry picked from commit 033b53a02fb02c5aec412e3d87ad9661110c6e6e) Conflicts: src/network/bearer/qnetworkconfiguration.h
* Fix QStaticText copy constructor to also copy text option propertyEskil Abrahamsen Blomfeldt2010-09-061-3/+3
| | | | | | | | | | The text option property of QStaticText was not copied in the copy constructor, so when the text was detached, the property would be reset to the default. Task-number: QTBUG-13368 Reviewed-by: Gunnar (cherry picked from commit 200d1743dcdacf1036384f746046e55d91ccd918)
* Added missing code to bring web browser foreground in Symbian.Janne Anttila2010-09-061-0/+1
| | | | | | Task-number: QTBUG-8336 Reviewed-by: Miikka Heikkinen (cherry picked from commit d5373433d2a6d632e06d3873003069d49e17e2cd)
* Fixed a broken def file entry.axis2010-09-032-2/+2
| | | | (cherry picked from commit 7e8073b37a8a3e58d82b71934f085ec8143935eb)
* Modified file/directory names and text to remove disallowed terminology.Kevin Wright2010-09-032-7/+7
| | | | (cherry picked from commit a02eba0de0fcf9a17d489ee1f92977c95d3afd76)
* Fixed input context trying to squeeze content into a full widget.axis2010-09-031-0/+7
| | | | | | | | | | | | Problem was reproduced on N97. If the FEP detects that the widget is full while still editing text, it will try to send those events as key events instead. Since this screws up the content in the widget, we stop those events from reaching the widget in the input context. AutoTest: Passed Task: QTBUG-12949 RevBy: Miikka Heikkinen (cherry picked from commit 5ca6264933af60b3cd376b7f08bea008fa69b515)
* Cleaned up position tracking in the Symbian input methods.axis2010-09-033-15/+18
| | | | | | | | | | | | | | | | | | | | | | This fixed a case where using password mode would lead to Qt believing that the cursor was one step to the left of where it really was. This would have the effect of replacing the last character instead of appending to it, and even crashing if the cursor was all the way to the left. The code is also much cleaner this way, but it meant that QTBUG-9867 had to be solved differently this time. We do this by assuming that and empty FEP update means "erase last character", which seems to work well in practice. Also added a long overdue autotest for the FEP input methods. Most tests pass, but some don't, which I will try to fix later. Task: QTBUG-9867 Task: QTBUG-12949 RevBy: Miikka Heikkinen AutoTest: Included (cherry picked from commit 52cf47565e402dc682038ccaf8d725401802b603)
* Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"axis2010-09-033-16/+2
| | | | | | | | | | This reverts commit 05eacd9ad40f8adb5aaa12a8b90113a73b43f642. Conflicts: src/gui/inputmethod/qcoefepinputcontext_p.h src/gui/inputmethod/qcoefepinputcontext_s60.cpp (cherry picked from commit c5901037f0d3ccd45b0c79b38ef5b04552dad0aa)
* Don't overflow the unreferenced cost counterAaron Kennedy2010-09-031-7/+9
| | | | | QTBUG-13345 (cherry picked from commit b6d47ea4872e188d8da6886cb1922f1a89245825)
* Fix a crash when passing a null pixmap to QPainter::drawPixmapFragments().Trond Kjernåsen2010-09-031-1/+1
| | | | | | Task-number: QTBUG-13331 Reviewed-by: Samuel (cherry picked from commit dcb98430f6add24c9d54253bd35d35010cc75c23)
* Fix compiling issue for FreeType version earlier than 2.1.10Jiang Jiang2010-09-031-2/+9
| | | | | | | | | | | | FT_GlyphSlot_Embolden was introduced since FreeType 2.1.10 and we started using it since 4.7. Some systems (including RHEL/CentOS 4) only provide earlier versions will get a compiling error if they use -system-freetype to build Qt. This patch fix it by providing a graceful degradation when the function is not available. Task-number: QTBUG-13274 Reviewed-by: Eskil (cherry picked from commit 25622198904580c6eb93996f74c2e7b62afa77c7)
* Update QDesktopWidget geometry when S60 furniture visibility changesGareth Stockwell2010-09-032-2/+10
| | | | | | Task-number: QTBUG-13204 Reviewed-by: axis (cherry picked from commit 55b067d14d8c12bd29b03c17e0281a11a49f95ca)
* Ensure geometry of top-level widget accounts for S60 screen furnitureGareth Stockwell2010-09-031-13/+13
| | | | | | | | | | | | | | | If the S60 screen furniture has already been constructed before QWidgetPrivate::show_sys() is called on a top-level widget which has Qt::WindowMaximized set (e.g. due to a showMaximized() call), its geometry is set to the full screen extent, including the regions covered by the status bar and CBA. This patch ensures that calculation of the widget geometry always takes into account the screen furniture. Task-number: QTBUG-12605 Reviewed-by: Jason Barron (cherry picked from commit a957ed92a61d9311ed163dba15f2b6f8d30bf03c)
* Clear Qt::WA_OutsideWSRange when making window fullscreenGareth Stockwell2010-09-031-0/+2
| | | | | | Task-number: QTBUG-10269 Reviewed-by: Jason Barron (cherry picked from commit 859cca02a89ecadbb5578bb113e535374bcfcaca)
* Prevent null pointer dereferenceGareth Stockwell2010-09-031-1/+1
| | | | | | Task-number: QTBUG-13204 Reviewed-by: axis (cherry picked from commit 9d88ff485e93e9701719263ce0a46cb86b0398ca)
* Refactored handling of window visibility events on SymbianGareth Stockwell2010-09-022-26/+37
| | | | | | Task-number: QTBUG-12817 Reviewed-by: Jason Barron (cherry picked from commit ea85300f6456ef1bd9702296f3068edf0795736e)
* Replaced backing store reference count with list of visible widgetsGareth Stockwell2010-09-023-31/+58
| | | | | | | | | | | | | | | | | | | | | | | Previously, the following sequence: 1. Widget is hidden 2. Widget partially revealed 3. Widget fully revealed resulted in the reference count of the backing store owned by the widget's window() being incremented twice. This patch replaces the simple reference count with a QSet which stores pointers to the native widgets which are descendents of the backing store owner, and which are currently visible. The sequence above therefore results in just a single insertion at step (2), with step (3) having no effect on the backing store. The QRefCountedWidgetBackingStore class has been renamed QWidgetBackingStoreTracker to better reflect its purpose. Task-number: QTBUG-12800 Task-number: QTBUG-12817 Reviewed-by: Jason Barron (cherry picked from commit cb8d2dcc70846ccd9384a8b94b2a80821c0eb285)
* Fix for memory leak in qt_initShane Kearns2010-09-021-0/+2
| | | | | Reviewed-by: Miikka Heikkinen (cherry picked from commit 5d32b723332acab5fdf880aa0d555ab8e05d79dd)
* Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jason McDonald2010-09-0234-38/+41
| | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-11938 (cherry picked from commit eea84818e98af917d3cf2bf04ea17a416ef9d55e) Conflicts: src/script/api/qscriptcontext.cpp
* Pending surface might not get destroyed if no flush() happensJani Hautakangas2010-09-023-16/+9
| | | | | | | | | in between graphics system change. This patch ensures that all old surfaces are destroyed before new graphics system is activated. Reviewed-by: Jason Barron (cherry picked from commit d3ab1fccea2b1e011e7518269a29045a53f0a30b)
* Use ARGB32 premultiplied backing store format in Symbian^3Jani Hautakangas2010-09-022-5/+10
| | | | | | | | raster paint engine for translucent windows. Task-number: QTBUG-12710 Reviewed-by: Jason Barron (cherry picked from commit 0210bbbd7bf8254be5f7f19f524068cd39fc34c2)
* Register window types for Symbian system effectsJani Hautakangas2010-09-023-1/+61
| | | | | | | | | | | Set the purpose of the window (dialog/popup/child window etc...). Notify WServ when modal window is shown/hidden Notify WServ when temporary surface deallocation happens. Notify WServ when the application is going to shutdown. Task-number: QT-2027 Reviewed-by: Jason Barron (cherry picked from commit 339270016bd8805b081f0b4ff550906a6bcfec5b)
* Remove the memory tracking attempt from the runtime graphics system.Jason Barron2010-09-026-100/+6
| | | | | | | | | | It has been decided that this logic will not be used by anyone at the moment so let's remove it. This removes an exported (although private) virtual function so breaks binary compatiblity for plugins built with previous versions. Reviewed-by: Jani Hautakangas (cherry picked from commit bd1aeaa50c60cffa3e195f3f6aed808f23a5c73c)
* Removed static on a member that didn't have to be.axis2010-09-022-5/+8
| | | | | | | One step further towards no static data... RevBy: Trust me (cherry picked from commit ddbffbe7271cfdd3935c188ccb8e804ad73627f6)
* Ensure that window rectangle is updated when CBA visibility changesGareth Stockwell2010-09-023-21/+33
| | | | | | | | | | | | | | | | | | | | | | | In S60, there are two pieces of screen furniture, changes in whose visibility or size can affect the size of the Qt application window. These are the status pane, at the top of the screen, and the CBA at the bottom. QSymbianControl listens for changes in status pane visibility and size by implementing MEikStatusPaneObserver. Notifications received via this interface trigger a call to QSymbianControl::handleClientAreaChange() which resizes the control. There is no corresponding interface through which to receive notifications of changes in CBA visibility. This patch introduces a utility function for setting the visibility of both the status pane and CBA, which ensures that the control's rectangle is updated when either one changes. Task-number: QTBUG-5320 Reviewed-by: Jason Barron (cherry picked from commit 92d6d1c974206bac7520101ad26ca93eb0b4d977)
* Fix crash caused by not clearing the QPixmapCache on application exit.Oleh Vasyura2010-09-021-0/+2
| | | | | | | | | | | | | | | The qt_cleanup() function will call CCoeEnv::DestroyEnvironment() on application shutdown. This destruction will in turn tear down the various server sessions associated with the application. One of these sessions is the FBSERV session and if the QPixmapCache attempts to delete a CFbsBitmap after the session has been destroyed, the app will crash. The solution is call QPixmapCache::cleanup() before we destroy the environment. This is inline with what the other platforms do. Reviewed-by: Jason Barron (cherry picked from commit 55625badfab6bfe49c60ab5cd9a586c6bd511579)
* Ensure native window is considered invisible when it gets destroyedGareth Stockwell2010-09-021-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The lifetime of the backing store depends, on Symbian, on the visibility of the native windows which are rendering from it. Specifically, once all such windows (i.e. the TLW window and those of any native widget descendents) have become invisible, the backing store is deleted. During re-parenting of a visible native child widget from parent1 to parent2, the following events occur: 1. QWidget::hide() is called on the child 2. The child widget's native control is deleted 3. A new native control is created, with its parent set as parent2->window()->effectiveWinId() Because there is no yield to the event loop between (1) and (2), the application does not receive a 'window hidden' notification as a result of the call to hide(). This means that the child widget is not removed from the list of visible widgets held in the backing store of parent1->window(). This patch ensures that the child is removed from this list during between steps (1) and (2). Task-number: QTBUG-12406 Task-number: QTBUG-12817 Reviewed-by: Jason Barron (cherry picked from commit bc1c472967c78579178cf7e98ab999842fee3102)
* doc: Remove \internal tag from QScriptProgramKent Hansen2010-09-022-5/+2
| | | | | | | | | The class has been there since 4.6 (http://labs.trolltech.com/blogs/2009/11/23/qtscript-in-46/), but we don't see a reason to hide it any longer. Task-number: QTBUG-13229 Reviewed-by: Olivier Goffart (cherry picked from commit 94791e6d5be6859d87862d40233aece16d54932a)
* Destroy QNetworkConfigurationManager global static from qApp dtor.Aaron McCarthy2010-09-021-1/+22
| | | | | | | | | | The order of global static destruction is not well defined. Ensure that the QNetworkConfigurationManager global static is destroyed from the QCoreApplication destructor before its dependencies are destroyed with the rest of the global statics. Task-number: QTBUG-13304 (cherry picked from commit 744ff7738333c35e7d621c61d72422cf3a8e7fe4)
* Fix QStaticText with OpenGL1 engineEskil Abrahamsen Blomfeldt2010-09-021-1/+2
| | | | | | | | | | Like OpenGL2 and OpenVG, the OpenGL1 paint engine also transforms text coordinates itself and does not require QStaticText to use device coordinates. Task-number: QTBUG-13228 Reviewed-by: Samuel (cherry picked from commit d0f1f569e27f7f34f3bfc03bd759f28f7b567997)
* Apparently QPen::brush() can't return a NoBrush for a NoPen.Trond Kjernåsen2010-09-021-4/+4
| | | | | | | | | There are explicit tests in qdatastream for this. IMO it's wrong, wrong, wrong, but it's currently abused in the SVG module so we can't change it. Reviewed-by: Gunnar (cherry picked from commit bdcfcc607c1a6744cf1b35eca0914fa96e70071c)
* Fix mispositioned text with QStaticText and OpenVG graphics systemEskil Abrahamsen Blomfeldt2010-09-021-2/+5
| | | | | | | | | | | | The OpenVG paint engine, like the OpenGL2 paint engine, supports caching the untransformed glyphs and transforming them as they are drawn. Since we would pretransform the positions of the glyphs, the transformation would be applied twice, thus making the glyphs appear in the wrong location when the painter had a transform set. Task-number: QTBUG-13049 Reviewed-by: Gunnar (cherry picked from commit f3771c5d91995b2beaa73bd3e3c783b76a887b50)
* Add text decoration support to QStaticTextJiang Jiang2010-09-021-13/+71
| | | | | | | | | | | | | The original code path of QStaticText does not include decoration drawing, this patch generalized the drawTextItemDecoration() function to draw decoration for drawText(), then use that to draw decoration for QStaticText. A helper function called drawDecorationForGlyphs() is made to allow easier extension for direct glyphs drawing support. Task-number: QTBUG-12121 Reviewed-by: Eskil (cherry picked from commit a1641e27d2e2f5e29362e3737be6b9d75714d138)
generated by cgit v0.12 at 2024-11-22 19:07:14 (GMT)