summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash when all visible items inluding currentIndex have been removed.Martin Jones2010-08-061-1/+1
| | | | | | Task-number: QTBUG-11251 Reviewed-by: Bea Lam (cherry picked from commit 7de5f19f0f62f181132394da6d7b2c8484cd42d9)
* Fixed the curve descriptions and added descriptions for overshoot, ↵Jerome Pasion2010-08-061-6/+16
| | | | | | amplitude, and period. Fix for QTBUG-7940. (cherry picked from commit 11f8bbaff73811c8d3342600bc7c77f47c34c7de)
* Fixed incorrect include/Qt/qconfig.h in binary packages.Rohan McGovern2010-08-061-1/+4
| | | | | | | | | | | | | When building from a source package, src/corelib/global/qconfig.h exists. syncqt contained logic to force the creation of include/Qt/qconfig.h for the case where it _doesn't_ exist. This meant that running syncqt from a Qt source package resulted in include/Qt/qconfig.h including qconfig.h twice. Task: QTBUG-12637 Reviewed-by: Toby Tomkins (cherry picked from commit 29d77e6003d0e156e5979dc8eb72e7ed8eb51456)
* Update def files.Aaron McCarthy2010-08-062-1/+5
| | | | (cherry picked from commit ed6d7222894a9bdc804d8c64845e2f0f356d2c01)
* Fix crash when setting font decorations on text drawn with QStaticTextEskil Abrahamsen Blomfeldt2010-08-051-1/+6
| | | | | | | | | | | Qt has a run-time assert for implementing drawPolygon() in any subclass of QPaintEngine, which will be hit if set font decorations on the font used by QStaticText. Since we don't care about line decorations or any other shapes drawn in the QTextLayout, we simply leave the implementation empty. Reviewed-by: Gunnar (cherry picked from commit 43f37074391b338b250883dfeb4a16844ca759fd)
* Fix last character being overwritten in password fieldShane Kearns2010-08-051-0/+4
| | | | | | | | | | | The temporary cursor position was not being updated after committing the input (changing the cleartext into a *), as a result of which, the next keypress was mistaken for a multitap input which should replace the last character. Task-number: QTBUG-11673 Reviewed-by: axis (cherry picked from commit 7acf2417bd2ae17c2e3c289c7caed84219e5fecd)
* Fix the remote command delimiter, this has cahnged at some point.kh12010-08-053-3/+3
| | | | | | Task-number: QTBUG-12485 QTBUG-12651 Reviewed-by: ck (cherry picked from commit 2838cfa7809e6b196a1ee1eb71df5894fc57dd6f)
* Modified qtdemo so error does not appear when there is no demo/example ↵Kevin Wright2010-08-051-2/+2
| | | | | | description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. (cherry picked from commit e55fd8c9790863f2d6001bda617a9d87be61f29b)
* 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-0520-210/+228
| | | | | | | | | | Task-number: QTBUG-12378 Reviewed-by: Alex
* | Rename QNetworkConfiguration::bearerName() function.Aaron McCarthy2010-08-054-22/+34
|/ | | | | | | | | | | | 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-043-7/+66
| | | | | 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)
* configure: don't symlink the mkspecs/features directoryJoerg Bornemann2010-08-041-0/+8
| | | | | | | | | | | | | | In shadow builds, the directory QT_BUILD_TREE/mkspecs/features isn't a mere symlink anymore. The directories below mkspecs/features are copied and every single file is symlinked. This makes it possible to place .prf files into a shadow build's mkspecs/features directory, like Qt Mobility does with its mobility.prf, without polluting the source directory. Task-number: QTBUG-12545 Reviewed-by: ossi (cherry picked from commit aff888a3e7f3d9ee2c5611c2dd5c0ff1693752c6)
* 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)
* Make it possible to manually set the orientation of QML Viewer on SymbianJoona Petrell2010-08-0415-35/+611
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12142 Reviewed-by: Warwick Allison This patch brings ability to switch QML Viewer's orientation between auto-orientation (=follow sensor), portrait and landscape orientations (lock orientation) on Symbian. It provides same orientation options as Qt Creator 2.1's Qt QML Standalone Application creation wizard. Also, menu item rotateOrientation now works on Symbian, but it's hidden when orientation mode is set to auto-orientation. Property runtime.orientation has been switched back to supporting four-way orientation on Symbian, previously it only updated values between portrait and landscape. If your application only supports landscape or portrait modes, just don't react to the inverted orientations. Added orientation example screenorientation under examples/declarative. The patch includes a fix for calculator example, which rotated to wrong direction when switching from portrait to landscape. Also, improved qdeclarativeviewer unit tests. Changes have been tested to work on Windows, Linux and Symbian^3. (cherry picked from commit e62f266a7642e675e9d235a1f54a6b5746500d48)
* Fix USB serial port detection of the Nokia N95 on linuxShane Kearns2010-08-044-9/+59
| | | | | | | | | | | | The interface numbers in /dev/serial/by-id are hex rather than decimal. Also added code to read the manufacturer name and product name from string descriptors in order to get a better match. Unfortunately, root privilege is needed or the API returns an error. In this case, we still use the weak matching on interface number only. Task-Number: QTBUG-11794 Reviewed-By: Thomas Zander (cherry picked from commit 767aa8d648bf81a3303da66a4fef98657ea5ece3)
* 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)
* Removed QEXPECT_FAIL macros from test cases which now passGareth Stockwell2010-08-041-3/+1
| | | | | | | Task-number: QTBUG-10643 Task-number: QTBUG-11376 Reviewed-by: Jason Barron (cherry picked from commit 3695cb25e4a53921880cfea4d4c731df44fa4396)
* 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)
* Removed the unfinished sentence. Fix for QTBUG-10173.Jerome Pasion2010-08-041-1/+1
| | | | (cherry picked from commit 79c6710c7785d915f64bd31e28ce48eed8493a41)
* Fixed the addressbook tutorial and some spelling mistakes. Fix for ↵Jerome Pasion2010-08-0413-14/+19
| | | | | | QTBUG-7071 and QTBUG-10173 (cherry picked from commit 14e17d5fe5f925a768aab9db9401e04bbaca224d)
* Added notice that some links are online documents.Kevin Wright2010-08-031-3/+3
| | | | (cherry picked from commit 41ae34d84a2d5024b5d42a25a2bf97b6a6dd8412)
* Fixed the following sub-tasks for QTBUG-12192Kevin Wright2010-08-031-2/+3
| | | | | | | | | | | | | | | | | | * Qt Simulator link missing * Integration and add-ins (on the front page, link leads to an alternative start page) * Qt Creator (on the front page link leads to Manual version 1.3) * Getting Started (on the front page) link broken * More... (in Global Declarations) link broken Additionally: There was an issue with the documentation used within Assistant/Creator that appears to have no bug report filed. An alternate "offline" form of the documentation (inspired by the newly redesigned online version) was being installed, but had significant issues within Assistant and Creator. It appears that within qdoc3 some changes had been made towards using this newer documentation format, but those changes were not working properly. I fixed qdoc3 so that the original offline documentation design is the default, but there is room to use the configuration files to call the any of the three documentation designs (new online, new offline, and old offline).
* qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconfMartin Smith2010-08-036-59/+59
| | | | (cherry picked from commit b588cfe80741ec500fc0a52586145e5849ca5968)
* Fix the rendering of lines with the X11 paint engineBenjamin Poulain2010-08-032-12/+75
| | | | | | | | | | | | | | 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)
* Pulled major qdoc3 changes into the releases branch.Toby Tomkins2010-08-0317-176/+354
|
* Update QtGui def filesJoona Petrell2010-08-032-0/+6
| | | | | Task-number: QTBUG-12333 Reviewed-by: Martin Jones
* State doc fixes, improvementsBea Lam2010-08-035-82/+227
| | | | | 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-027-2/+55
| | | | (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)
* Add snippets directory as it was missed in initial merge.Toby Tomkins2010-08-0210-6/+441
| | | | Task-number: QTBUG-12498
* 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-022-1/+1
| | | | | Task-number: QTBUG-12529 (cherry picked from commit ca61cd321b867d912bd13b0530fbf2847d1c593c)
* Mention scope of id uniquenessBea Lam2010-08-022-1/+10
| | | | | Task-number: QTBUG-12528 (cherry picked from commit 765c263d538b258f223dfb6bd7f62dbd19853db6)
* Update QML Documents exampleBea Lam2010-08-023-26/+98
| | | | | Task-number: QTBUG-12526 (cherry picked from commit eef2e72976f3f8d10a34c9dfb3f60f40616f4df9)
* Fix crash on Desktop platforms.Aaron McCarthy2010-08-021-11/+13
| | | | | | | Missing check for null networkSession. Task-number: QTBUG-12501 (cherry picked from commit 597a842d66dc04181bfd063863216acbb11ce3bc)
* Add missing \l doc commandsBea Lam2010-08-024-4/+4
| | | | (cherry picked from commit c2a22048a045f4e3d03b3251bc9af486250657e4)
* Add moving and flicking properties to PathViewMartin Jones2010-08-0211-480/+939
| | | | | | | | | | | 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)