summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge branch '4.7.0' of scm.dev.nokia.troll.no:qt/qt-releases into 4.7.0Toby Tomkins2010-08-0511-41/+113
|\
| * Updated WebKit to d6aa024c84f61d0602bef4eef84efaed7cfeefccSimon Hausmann2010-08-0411-41/+113
| | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/36723> || Crash while uploading a PDF document on www.largefilesasap.com || || <https://webkit.org/b/40572> || [Qt] Stack overflow when converting navigator object to QVariant || || <https://webkit.org/b/43037> || [Qt] Incorrect input method hints || (cherry picked from commit 321aa9d20101560dfcef6738be70916b47dbb0ed)
* | Use an enum to return the bearer type of a network configuration.Aaron McCarthy2010-08-0519-200/+210
| | | | | | | | | | Task-number: QTBUG-12378 Reviewed-by: Alex
* | Rename QNetworkConfiguration::bearerName() function.Aaron McCarthy2010-08-052-9/+21
|/ | | | | | | | | | | | bearerName() -> bearerTypeName(). bearerName() is deprecated and converted into an inline function which calls bearerTypeName(). This is required to keep existing code source compatible between Qt Mobility 1.0.x and Qt 4.7. Task-number: QTBUG-12378 Reviewed-by: Alex (cherry picked from commit 613bc8eb31d8a80b43aa045ab2040b7cb7e0eadf)
* Limit the pixmap cache in space as well as in time.Aaron Kennedy2010-08-041-7/+26
| | | | | QTBUG-12590 (cherry picked from commit 1fc6cab93ba2d067fadcd0979640c32aa1d5ae4a)
* Ensure dataChanged doesn't force request for unwanted data in QML views.Martin Jones2010-08-043-5/+23
| | | | | | | | | If a model emits dataChanged() every role was be updated, rather than just the roles required. Now only roles which have been used are updated. Task-number: QTBUG-12598 Reviewed-by: Michael Brasser (cherry picked from commit b7702b2dcbc36f81759dea0ad74fb19e97b2358f)
* Fix Flickable.StopAtBounds behavior when content size < flickable sizeMartin Jones2010-08-041-10/+16
| | | | | | | | | Clip the content position to the beginning rather than the end, if both apply. Task-number: QTBUG-12573 Reviewed-by: Michael Brasser (cherry picked from commit a0b531163a79c9097185b580fdf4aa8157cead41)
* Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.Jerome Pasion2010-08-041-3/+2
| | | | (cherry picked from commit f0e49104a864b3f658e8cc0036b742b20ad84872)
* Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa)Prasanth Ullattil2010-08-041-3/+5
| | | | | | | | | | In some cases the NSKeyDown event won't have fully constructed string in the [NSEvent characters]. So we need to add a guard before accessing the elements of this NSString. Task-number: QTBUG-12474 Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 307601da8d3b64de7b7d83a6de0b5dac290b0eb6)
* Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)Simon Hausmann2010-08-041-3/+29
| | | | | | | | | | Our stringToCMap implementation for CoreText that bypasses the shaping needs to have basic support for font cascading / glyph substitution. We now use CTFontCreateForString to determine the substitute font for missing glyphs. Task-number: QTBUG-12411 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com> (cherry picked from commit 00fb79714162ea3e434cf66a87a70a4fc26b2b86)
* Cocoa: Active QDockWidget does not stay on top of inactive QDockWidgetRichard Moe Gustavsen2010-08-043-0/+24
| | | | | | | | | | | | If a window has several child windows, it was not be possible to click on a child window to make it stack in front of the other children. The reason is that cocoa held a fixed stacking order of the child windows (sub-windows). This patch will release, and then reestablish, the stacking order of the children upon acitvation. Task-number: QTBUG-11780 Reviewed-by: prasanth (cherry picked from commit 44e11692549f1d6a4fed01066a06085dacfaa444)
* Ensure backing store is deleted before top-level windowGareth Stockwell2010-08-041-0/+4
| | | | | | | | | | | | If this is not done, later deletion of the backing store may cause a crash. If the backing store is an EGL surface, its destruction includes a call to eglDestroySurface(), which triggers an exception if the window handle passed as a parameter is no longer valid. Task-number: QTBUG-10643 Task-number: QTBUG-11376 Reviewed-by: Jason Barron (cherry picked from commit cc3c416682791e1a2fd61d9a473ba3b4715c502d)
* Fix the rendering of lines with the X11 paint engineBenjamin Poulain2010-08-031-12/+10
| | | | | | | | | | | | | | On the X11 paint engine, when rendering lines with float coordinates, the lines were one pixel off if the decimal was > 0.5. This fixes the WebKit bug https://bugs.webkit.org/show_bug.cgi?id=42248 Autotest by Yoann Lopes. Reviewed-by: Simon Hausmann Reviewed-by: Yoann Lopes Reviewed-by: Andreas Kling (cherry picked from commit ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6)
* Update QtGui def filesJoona Petrell2010-08-032-0/+6
| | | | | Task-number: QTBUG-12333 Reviewed-by: Martin Jones
* State doc fixes, improvementsBea Lam2010-08-031-14/+1
| | | | | Task-number: QTBUG-12570 (cherry picked from commit 3daee8e915f9845fb104e57c7f35fdb2f7251df5)
* Ensure currentItem is released when the delegate changesMartin Jones2010-08-032-0/+7
| | | | | | | | | Otherwise a new delegate isn't created for the currentItem. GridView didn't release any item. It is now equivalent to LsitView. Task-number: QTBUG-12548 Reviewed-by: Bea Lam (cherry picked from commit a07bae9717168c9605662e117132e16b5f2b2f9d)
* Make sure ListView.nextSection attached property is set for the first itemMartin Jones2010-08-031-1/+3
| | | | | | Task-number: QTBUG-12470 Reviewed-by: Bea Lam (cherry picked from commit 2501c66e3795040d72a1922499294a686832e7a2)
* Reference count items in VisualItemModel.Martin Jones2010-08-031-11/+37
| | | | | | | | | The views expect the models to reference count and not destroy (or hide in the case of VisualItemModel) until there are no references. Task-number: QTBUG-12450 Reviewed-by: Michael Brasser (cherry picked from commit d39d01497640c3a0818d25036894495f8b597bdb)
* Updated WebKit to e6e692bb056670e2781dd0bc473a60757ae53992Simon Hausmann2010-08-0223-65/+393
| | | | | Backported various crash fixes (cherry picked from commit 73595a315989581e2f59b28af5d150d39ea6b8ff)
* Updated WebKit to 0be9ff9f2b1ec2b748885ac15299bc1c65aca590Simon Hausmann2010-08-0213-12/+182
| | | | | | | | | | Integrated changes: || <https://webkit.org/b/42474> || Spatial navigation: do not consider outline for focusable element boundaries || || <https://webkit.org/b/41484> || [Qt] Clamp color stops passed to QGradient to 1.0 || || <https://webkit.org/b/29381> || [Qt] [Regression] QWebView::setHtml() executes script body twice || || <https://webkit.org/b/30879> || Loading HTML with a JS alert() when the DocumentLoader has been set to not defer data load results in ASSERT || (cherry picked from commit 9f657356f897d8bf4c92965a8bc1af82107e2379)
* Updated WebKit to 669858f9bbd4913fd16c642090375c81acbfdb04Simon Hausmann2010-08-026-2/+54
| | | | (cherry picked from commit a7bf97f437a8d4e44a9256a89d7d6ba239577949)
* Added automatic sqlite extraction for Symbian to QtWebKit.axis2010-08-021-2/+10
| | | | | | | | | | | | | | Also added sqlite detection in case sqlite is not present in the SDK. This is possible if WebKit is compiled standalone. The inclusion part is a consequence of commit c578c6c1d6d in the Qt repository. It will not work on Qt versions < 4.7.1, but that is ok, since the only build system it will affect is marked as experimental in the whole 4.7 series. RevBy: Kenneth Rohde Christiansen Task: https://bugs.webkit.org/show_bug.cgi?id=42744 (cherry picked from commit 9c8fe530f4068fc35a58008758ee2bc434415993)
* Updated WebKit to ad96ca2f9b57271da4ea7432022ac686ee0981c2Simon Hausmann2010-08-0259-160/+979
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/37760> || FrameView's layout root can be detached by style recalc || || <https://webkit.org/b/38922> || innerHTML decompilation issues in textarea || || <https://webkit.org/b/36878> || REGRESSION: Trailing colon on hostnames (with no port specified) causes "Not allowed to use restricted network port" || || <https://webkit.org/b/37781> || [XHR] Cross-Origin synchronous request with credential raises NETWORK_ERR || || <https://webkit.org/b/36502> || Cross-origin bypass: iFrame.src can be set to a JavaScript URL via nodeValue or textContent || || <https://webkit.org/b/28697> || WebKit crash on WebCore::Node::nodeIndex() || || <https://webkit.org/b/37031> || Cross-origin bypass: Javascript URL can be set as iframe.src via multiple DOM aliases || || <https://webkit.org/b/36522> || [Qt] Rename QWebSettings::XSSAuditorEnabled to XSSAuditingEnabled || || <https://webkit.org/b/38583> || Use of stale pointers whilst normalizing DOM nodes with mutation event handlers that modify element attributes || || <https://webkit.org/b/41412> || [Qt] Canvas arcTo() should draw straight line to p1 if p0, p1 and p2 are collinear || || <https://webkit.org/b/39878> || [Qt]: REGRESSION(r58703): QWebSettings::JavascriptCanAccessClipboard has wrong case in "Javascript" part. || || <https://webkit.org/b/26824> || focus() behavior permits keystrokes to be redirected across domains || || <https://webkit.org/b/39508> || Crash in WebCore::toAlphabetic() while running MangleMe || || <https://webkit.org/b/36571> || WebKit should treat port numbers outside of the valid range as being blacklisted || || <https://webkit.org/b/38497> || Make sure that http URLs always have a host in SecurityOrigin || || <https://webkit.org/b/38626> || ZDI-CAN-765: CSS Charset Text Transformation Vulnerability || || <https://webkit.org/b/36838> || Cross-origin image theft via SVGs as a canvas pattern || || <https://webkit.org/b/27751> || [sg:high] Copying text to the system clipboard can be done in any context || || <https://webkit.org/b/36843> || REGRESSION (r47291): XHR allows arbitrary XSRF across domains || || <https://webkit.org/b/37230> || REGRESSION (4.0.5): Safari asks for credentials all the time when authenticating to Windows IIS Server || || <https://webkit.org/b/37618> || Memory Corruption with Drag-Drop item from a purged document. || || <https://webkit.org/b/38260> || Frame.src allows javascript URLs with starting spaces || || <https://webkit.org/b/38261> || Table layout crash bug || (cherry picked from commit 5c50c6a782b127442c3fa748b3dd4d1007db69dc)
* Doc: Fixed incorrect QML property type.David Boddie2010-08-021-1/+1
| | | | | Reviewed-by: Trust Me (cherry picked from commit aba1572d588396d3c9e29192ae86047b5b10070a)
* Fixed gcce linker error when linking against s60main built by armcc.axis2010-08-021-0/+1
| | | | | | Task: QTBUG-10680 RevBy: Trust me (cherry picked from commit d82d8d1fc90b4237e483fea9813ec084633f6f2d)
* Add missing imageBea Lam2010-08-021-1/+1
| | | | | Task-number: QTBUG-12529 (cherry picked from commit ca61cd321b867d912bd13b0530fbf2847d1c593c)
* Add moving and flicking properties to PathViewMartin Jones2010-08-023-10/+124
| | | | | | | | | | | PathView handles its own mouse interaction, but lacked properties similar to those in Flickable to determine when it is stationary. This made it impossible to start an animation when the view stops moving, for example. Task-number: QTBUG-12497 Reviewed-by: Warwick Allison (cherry picked from commit eae48b410cc28b83433b7dcba379a31aae2ce2df)
* QFileDialog crashes when empty selectedFilter is set on Carbon.Prasanth Ullattil2010-08-021-3/+5
| | | | | | | | | We were making the wrong assumption that the selectedFilter string will be valid always, when calling functions like getSaveFileName(). Task-number: QTBUG-12461 Reviewed-by: Denis (cherry picked from commit fb47a99e1d0020e8dcc4cc4f9c188ccd2fd5ee3e)
* Document elements that are focus scopes.Yann Bodson2010-08-024-8/+18
| | | | | Task-number: QTBUG-12404 (cherry picked from commit d27e7484c8fcb08e0c533b9a8bf5af8d527b1de3)
* Remove use of shared NOTIFY signals in QGraphicsScaleMartin Jones2010-08-022-3/+9
| | | | | | | | | | Sharing a NOTIFY signal can cause binding loop warnings with no apparent cause. Task-number: QTBUG-12333 Reviewed-by: Aaron Kennedy Reviewed-by: Michael Brasser (cherry picked from commit 5d5feaa86f3933a1e89b53267953b86e2b0459ed)
* Remove use of shared NOTIFY signalsMartin Jones2010-08-0210-44/+89
| | | | | | | | | | Sharing a NOTIFY signal can cause binding loop warnings with no apparent cause. Task-number: QTBUG-12333 Reviewed-by: Aaron Kennedy Reviewed-by: Michael Brasser (cherry picked from commit cd813f93530512ffcedef6376e8c9266162c8714)
* Avoid a crash in the OpenVG paint engine when clipping to an empty pathJason Barron2010-08-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | The convertToPainterPath() function assumes that the QVectorPath contains at least one path element when creating the QPainterPath. This is not necessarily the case here though because if QVG_SCISSOR_CLIP is defined and setClipPath() is called with an empty QPainterPath, this is then converted to an empty QVectorPath in QPaintEngineEx::clip() which then calls QVGPaintEngine::clip(). This function then goes on to convert the QVectorPath back into a QPainterPath using the aforementioned function which crashes when attempting to access the first element of the path. In case you are wondering why this seemingly redundant conversion happens at all, it happens because when QVG_SCISSOR_CLIP is defined, we attempt to convert the path to a series of rects for scissor clipping and this conversion function operates on QPainterPath instead of QVectorPath which is what this clip() function was designed to deal with. The fix is to skip over the path conversion for empty paths and go directly to an empty QRegion. Reviewed-by: Alessandro Portale (cherry picked from commit 6d29bcc28c4ee9b7583a62d23a931b9389004966)
* Fixed key event handling on Symbian.axis2010-08-022-55/+118
| | | | | | | | | | | | | | | After looking at QTBUG-11338 and Qt's behavior, it became clear that we needed more state tracking in the key event handling code, to be able to handle all the different ways that we can get key events. This inspired having three states for each used scan code, instead of the old code, which only took the current scan code into account. This should make Symbian behave identically to Linux. Task: QTBUG-11338 AutoTest: N/A, platform specific code. There was lots of manual testing on 5800, N97 and N95. RevBy: Jason Barron (cherry picked from commit 041570ca54824ee358593f112b38e26632c3ebbf)
* Cleaned up old comments.axis2010-08-021-12/+0
| | | | (cherry picked from commit 5a3246b198ced3634bd974919e78310d536be27e)
* Refactored the virtual mouse handling code into its own function.axis2010-08-022-171/+181
| | | | | RevBy: Trust me (cherry picked from commit 998ba966215482048f7fa93908212b1ee4a0c357)
* Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-08-0218-31/+31
| | | | | | QTBUG-11938 and QTBUG-10801 (cherry picked from commit 5bdb85e3b21bcf624eb1830aa32d027e0c6870fe)
* Component docsBea Lam2010-07-291-21/+9
| | | | | Task-number: QTBUG-12447 (cherry picked from commit dd871bf6208821ab9852680a338133accbfdedd7)
* Fixes for Dynamic Object Management docs. Also adds links toBea Lam2010-07-292-17/+13
| | | | | | | this page from other documentation. Task-number: QTBUG-12446 (cherry picked from commit ceeb0fc0327c99de55d4dd6114908ec389dc58eb)
* various doc fixesBea Lam2010-07-295-13/+11
| | | | (cherry picked from commit 9ea7bb34e4b41e1263acb8a175f61566046f9bf6)
* Don't emit movementEnded if mouse press is a continuation of a flick.Martin Jones2010-07-291-15/+17
| | | | | | | | | | | When the mouse is pressed the flick is stopped, but this may be a continuation of a previous flick, in which case we don't want to emit movementEnded since this can cause stutters in animations triggered by movementEnded, for example. Task-number: QTBUG-12492 Reviewed-by: Warwick Allison (cherry picked from commit 1188c199beaacd0ffc3ef39716dd648d41f4d3d2)
* Improvements to Modules docsBea Lam2010-07-291-3/+3
| | | | | Task-number: QTBUG-12430 (cherry picked from commit 63920a41b8dde3b9fa2c47efe95fcbaf83a1178f)
* Update Symbian emulator QtOpenVGu.def, QtNetworku.def, QtCoreu.def files for ↵Joona Petrell2010-07-293-259/+252
| | | | | | | | Qt 4.7 to be in sync between respective def files in Qt 4.6.3 Task-number: QTBUG-12468 Reviewed-by: Jason Barron (cherry picked from commit 87c135ace11236fb33ebb0112f219b81425ed6f8)
* QMenu and QStyleSheetStyle: fix setting a border.Olivier Goffart2010-07-291-0/+7
| | | | | | | | | The native border would be drawn over the one drawn by the QStyleSheetStyle Regression since 68a498284e206e2bb000bc35331c966f3790f607 Reviewed-by: Gabriel Task-number: QTBUG-10785 (cherry picked from commit 0318f0d5a43a78831f3bf4cb043d0b2b41cd9987)
* Cherry pick fix for MOBILITY-1234 from Qt Mobility.Aaron McCarthy2010-07-291-0/+2
| | | | | e51af0d74f8bb6ca6100d2338671d2d053bfed01 (cherry picked from commit 9814b2225b70d6b2f758e9dbe98f8e1662049b37)
* Cherry pick fix for QTMOBILITY-408 from Qt Mobility.Aaron McCarthy2010-07-292-33/+34
| | | | | 7f9a8ebcfe86d3df428707888c3ab5fcd10226a4 (cherry picked from commit 71ef5269c03d6230e6ebbf6f3c0b6f8836739ec3)
* Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-293-24/+68
| | | | | f84bb604d745c512db8d53410c5fec835309f85e (cherry picked from commit a259bd2841b3ce7e34bb18990332bd497f97cdd0)
* Order network configurations in service networks in priority order.Aaron McCarthy2010-07-293-46/+59
| | | | | | | | | It is useful to know the priority order of the sub configurations of a service network. Task-number: QTBUG-11678 RevBy: juhvu <qt-info@nokia.com> (cherry picked from commit 959efa8daab2715d18440ed8b890b9dd2b501fc7)
* Fix compilation error on Symbian^4.Aaron McCarthy2010-07-293-12/+12
| | | | | | The root cause is failing compilation test for SNAP when it shouldn't, but it should still not result in compilation errors in code. (cherry picked from commit 6ca74af0121f6038a20bca363deaf5c3e2d760f9)
* Fix detection of OCC functionality.Aaron McCarthy2010-07-291-1/+1
| | | | (cherry picked from commit ce7ccc93275043a41648a8887525be92420c3acb)
* Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-293-48/+93
| | | | | 2f582953ecfc53f217317f58e4fc75b5b51a1126 (cherry picked from commit 34691d27d03abc0c8f940b4a0a3cda4cd308642e)