summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-11-090-0/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: (131 commits) Qml Debugging: Only enable if explicitly requested Do not crash on Symbian Revert "Work around bug causing qml apps to crash on Symbian 5.0 devices." Work around bug causing qml apps to crash on Symbian 5.0 devices. Fix patch_capabilities.pl script for explicit set of capabilities Update license headers to release version. Adjust the parent index for the itemsMoved call. Workaround for QFileSystemWatcher regression Cleanup changelog for 4.7.1. My changes for 4.7.1 Update change log. Revert "Don't define highp/mediump/lowp if desktop GL has them" Avoid in-place convertion of images with multiple references Add missing data for the autotest of in-place conversion for Pixmap Fixes assert in QDeclarativeWebView QGraphicsItem device coordinate cache unefficient in portrait mode Fix minehunt execution from QtDemo Ensure PathView updates positions when path changes. Support device orientation in harmattan Some 4.7.1 changes. ...
| * Merge commit 'v4.7.1' into 4.7Jason McDonald2010-11-090-0/+0
| |\
| | * Qml Debugging: Only enable if explicitly requestedv4.7.1Jason McDonald2010-11-0312-3/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable the remote debugging of QDeclarativeEngines only after QDeclarativeDebugHelper::enableDebugging() has been called. Approved by 4.7 Program Team. Reviewed-by: Alessandro Portale Task-number: QTBUG-13762 (cherry picked from commit b2016bbfc9c7389e7b64451417395ceba96af21f) Conflicts: src/s60installs/bwins/QtDeclarativeu.def src/s60installs/eabi/QtDeclarativeu.def
| | * Do not crash on SymbianJason McDonald2010-10-295-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qml debugging enabler in QtDeclarative made any Qt app crash which used QDeclarative. Reason was that QtDeclarative.dll tried to directly access (private) writable static data from QtGui.dll. This patch adds an accessor function for the data to QtGui, and the crash is gone. Done-by: Kai Koehne Reviewed-by: Kai Koehne (cherry picked from commit 2362d8b1e9fa86da1d3cc5dbb7d4467ec12311e1) Conflicts: src/declarative/debugger/qdeclarativedebugservice.cpp
| | * Revert "Work around bug causing qml apps to crash on Symbian 5.0 devices."Jason McDonald2010-10-292-1/+0
| | | | | | | | | | | | This reverts commit 391e173a8915230205a93b6e0709762f75547772.
| | * Work around bug causing qml apps to crash on Symbian 5.0 devices.Jason McDonald2010-10-282-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Disable QML debugging on the devices for now. A better fix will be provided in the next release. Task-number: QTBUG-14670 Reviewed-by: Miikka Heikkinen
| | * Fix patch_capabilities.pl script for explicit set of capabilitiesMiikka Heikkinen2010-10-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Elftran command never got executed when explicit set of capabilities was defined. No warning or error was printed either, making it rather confusing for user. Task-number: QTBUG-14730 Reviewed-by: Janne Koskinen (cherry picked from commit f603ce9a960ee387ab10be1916da8ffd09305045)
| | * Update license headers to release version.Jason McDonald2010-10-187263-94604/+94604
| | |
| | * Adjust the parent index for the itemsMoved call.Stephen Kelly2010-10-153-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not doing this causes the parent QModelIndexes to be out of sync with the model. The fix in fe350ca756df6392b3d0b7840351fccc89f9ef6f is extended to also use adjusted indexes in the itemMove call. Merge-request: 849 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> (cherry picked from commit 62dc9c9602987f4381481cc5642e3ea0782bb418)
| | * Workaround for QFileSystemWatcher regressionJarek Kobus2010-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Don't call removePath() when it was not added before. Reviewed-by: con <qtc-committer@nokia.com> Task-number: QTBUG-14435 (cherry picked from commit f38e8394eae20f7290688629ab66720ebacd64c9)
| | * Cleanup changelog for 4.7.1.Jason McDonald2010-10-151-155/+173
| | | | | | | | | | | | (cherry picked from commit eb625b3112c241047e8d08146b63545165d33ebf)
| | * My changes for 4.7.1Miikka Heikkinen2010-10-151-1/+43
| | | | | | | | | | | | | | | Reviewed-by: TrustMe (cherry picked from commit 0b905d602ffb24b8cad4f09d84a5f762cc6a6603)
| | * Update change log.Andrew den Exter2010-10-151-1/+5
| | | | | | | | | | | | (cherry picked from commit 976391c5ce2bbe3b992298e140bbbbc596ca756f)
| | * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-134-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd. The GL_ARB_ES2_compatibility extension does not mention the lowp, mediump or highp keywords. Task-number: QTBUG-14384 Reviewed-by: Samuel Reviewed-by: Prasanth (cherry picked from commit 7cd0a90344d340f22b6b2d3afeef092dbaf2cd51)
| | * Avoid in-place convertion of images with multiple referencesBenjamin Poulain2010-10-102-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The decoding from image reader was assuming the image reader do not keep the image internally. This is not true for the GIF plugins because the previous image can be used to compose the current image. This was causing crash on ARM because the 16 bits color depth causes the image memory to be reduce by half. When the plugin was accessing the memory, it assumes the images has not changed and is on 32 bits. This patch disable the in-place conversion if a detach is required. Regular conversion is the correct solution in this case, and it can also be made faster by converting while copying. Reviewed-by: Andreas Kling (cherry picked from commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b)
| | * Add missing data for the autotest of in-place conversion for PixmapBenjamin Poulain2010-10-101-0/+0
| | | | | | | | | | | | | | | | | | The commit 4d974ff0a748b22e668a4cb7ef38101122c85b3b uses an new image which was not commited with the patch. (cherry picked from commit f0c1f381af7d6338ded9f65d00ed54b1b9405ba9)
| | * Fixes assert in QDeclarativeWebViewThomas Hartmann2010-10-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QDeclarativeWebView was instantiated twice an assert was triggered by QWebSettings::enablePersistentStorage(); This patch is crtical for tooling (Bauhaus) Task-number: QTBUG-14278 Reviewed-by: Aaron Kennedy (cherry picked from commit f532679ca11914b453e22342f2ae5e9f790ce47a)
| | * QGraphicsItem device coordinate cache unefficient in portrait modeBjørn Erik Nilsen2010-10-082-18/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem was that we always invalidated the cache whenever the item was rotated. This is however not required for simple rotations such as 90, 180 and 270 degrees. This commit also removes the somewhat arbitrary logic which takes the desktop size into account. We now use the viewport size instead. Auto test included. Task-number: QT-3779 Reviewed-by: yoann (cherry picked from commit e84ab1fee7f44a28ee82793f83b0b27d04d28c09)
| | * Fix minehunt execution from QtDemoJoona Petrell2010-10-085-2/+24
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-14250 Reviewed-by: Martin Jones (cherry picked from commit 695b54e671b55bd8103dee8b30ee76309dbd26c1)
| | * Ensure PathView updates positions when path changes.Michael Brasser2010-10-084-2/+52
| | | | | | | | | | | | | | | | | | | | | | | | Fixes regression caused by optimization added in commit 35a51442ed21f58c06b21293eeb56e843251ee82. Task-number: QTBUG-14239 Reviewed-by: Martin Jones
| | * Support device orientation in harmattanMartin Jones2010-10-082-0/+166
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-14137 Reviewed-by: Aaron Kennedy (cherry picked from commit f9a8c4ec598a0070b9d2d861efe5ee69d5045a1f)
| | * Some 4.7.1 changes.Bjørn Erik Nilsen2010-10-071-0/+10
| | | | | | | | | | | | (cherry picked from commit 72fd8399aa36395e41f497fff79842496d6f9b03)
| | * Update changesJens Bache-Wiig2010-10-071-0/+2
| | | | | | | | | | | | (cherry picked from commit 7d5afd371d634e35192ab27f65c6dc895f7bbb5c)
| | * Add declarative changelog entries for 4.7.1Joona Petrell2010-10-071-0/+92
| | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Yann Bodson (cherry picked from commit 753d366ced1a62a97d5207eb2708817efc35bc4d)
| | * connman backendLorn Potter2010-10-071-0/+1
| | | | | | | | | | | | (cherry picked from commit ba698e20b32defcb0840293fc4ac5948f7c190c9)
| | * My changelog entries for 4.7.1Markus Goetz2010-10-071-0/+4
| | | | | | | | | | | | (cherry picked from commit 646c37a670b101487a76b1e787fd298187b49430)
| | * updated changes-4.7.1Joerg Bornemann2010-10-071-0/+12
| | | | | | | | | | | | (cherry picked from commit 0ce33ebfa8b99c2988b56d0157ddc039a9ab06ae)
| | * Update changelogOlivier Goffart2010-10-071-0/+24
| | | | | | | | | | | | (cherry picked from commit 8050dc45c8c9a134875196dcddf010d4194fd974)
| | * my contributions to dist/changes-4.7.1Bradley T. Hughes2010-10-071-1/+7
| | | | | | | | | | | | (cherry picked from commit 3519840ef2c5cb7cbc5b32ffc9976a8638187d64)
| | * My 4.7.1 changes.Trond Kjernåsen2010-10-071-2/+11
| | | | | | | | | | | | (cherry picked from commit 99340cf858731f531af29be1e1368e4991e8564e)
| | * added my and Jan-Arve's change to changelog for 4.7.1Thierry Bastian2010-10-071-0/+11
| | | | | | | | | | | | (cherry picked from commit c1a9c50d53ae41b19bdcd7930eec0805498e01c6)
| | * Changes done for 4.7.1Prasanth Ullattil2010-10-071-0/+4
| | | | | | | | | | | | (cherry picked from commit 583ca462caf656af17bea1c3f05d88ae7785ae91)
| | * Updated changes-4.7.1Samuel Rødal2010-10-071-1/+4
| | | | | | | | | | | | (cherry picked from commit 2d1e3b9778328046d3ba94dd51c37c507e618721)
| | * My changes.Aaron McCarthy2010-10-071-0/+2
| | | | | | | | | | | | (cherry picked from commit 2b70a3a6d5ebef36e90f52076c5d942d8cc171d7)
| | * Added note to changes-4.7.1Zeno Albisser2010-10-071-0/+9
| | | | | | | | | | | | | | | Reviewed-by: Frederik Gladhorn (cherry picked from commit 02de74f0b2d443e410154e96321357cfe2ef9aad)
| | * Added my changes to the changelog.axis2010-10-071-0/+12
| | | | | | | | | | | | (cherry picked from commit fbf91dc787c15f561686cd708735ff8f45984aba)
| | * dist/changes: QML Debugging changesLasse Holmstedt2010-10-071-1/+5
| | | | | | | | | | | | (cherry picked from commit baa2d6bee64e458f547b290d7cd1acdfc6292e05)
| | * Updated changes-4.7.1.Kim Motoyoshi Kalland2010-10-071-1/+3
| | | | | | | | | | | | (cherry picked from commit bed3d1eca213f24dae13cbd4cda4df94d9f0738b)
| | * Changelog: 4.7.1 (uic/Designer).Friedemann Kleint2010-10-071-0/+1
| | | | | | | | | | | | (cherry picked from commit f160e04ebe2926d09c20ef3960def1388a566db7)
| | * Update the changelog with the SSE work done for Qt 4.7.1Benjamin Poulain2010-10-071-2/+7
| | | | | | | | | | | | (cherry picked from commit 9c97aa4946a1d6b22bdcd8475f32b5ead7051976)
| | * my changes for 4.7.1Peter Hartmann2010-10-071-0/+10
| | | | | | | | | | | | (cherry picked from commit f2be9f394972edffa0eebc9c30fe00a4fce81abc)
| | * My Qt 4.7.1 changesEskil Abrahamsen Blomfeldt2010-10-071-0/+9
| | | | | | | | | | | | (cherry picked from commit 77b9b5dc93662d505b2c69211d001e5672d8a2cb)
| | * Revert "When using complex transformations rendering goes easily off by one ↵Jani Hautakangas2010-10-061-92/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pixel." This reverts commit 2acdc634ee895af4a9738c0f6c2496e388afba38. Originally this fixed QT-3791 but it caused lots of problems in other sites. So reverting this will fix QT-4001 but reopens QT-3791. QT-4001 blocks Qt 4.7.1 but QT-3791 doesn't. Task-number: QT-4001 Reviewed-by: Jason Barron (cherry picked from commit 25ddfb434f13aa3bbc6ac303aa17dbe9582bf3f0)
| | * QS60Style: QDateEdit - Layout issuesSami Merila2010-10-061-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In portrait orientation, QDateEdit's calendar popup (QCalendarWidget) does not fit into screen. As a fix, the pixel metric PM_FocusFrameHMargin, is reduced from 13 to 3 in qHD screens (640*360). Also, the explicit halving of the pixel metric for QTableViews is removed. The pixel metric resulted in 27 pixel text margins (2 * pm + 1)for calendar widgets, which is clearly a bit too much. Task-number: QTBUG-14126 Reviewed-by: Miikka Heikkinen (cherry picked from commit b3f895fd97deda0c7c5bfd704c04450e7afee748)
| | * Update .def files for recent cherry-picks.Jason McDonald2010-10-053-10/+267
| | |
| | * Fixed a layout issue where you could get NaN as dimensionsThierry Bastian2010-10-051-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that with empty layouts we could sometimes divide by 0. Note: This doesn't fix the whole task... Task-number: QTBUG-13547 Reviewed-by: ogoffart (cherry picked from commit c1f9978c9d61bcbdb2f280185a3abdea13d7f532)
| | * Build fix for -qtnamespace.Leandro Melo2010-10-042-0/+9
| | | | | | | | | | | | | | | Reviewed-by: Thiago Macieira (cherry picked from commit b8089f0b7a0fef9318070aea9c8344bfe987bac9)
| | * Doc update for the support of MSVC 2010 64-bitThierry Bastian2010-10-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | MS has released a hotfix for the support of MSVC 2010 64-bit. It fixes the optimizer that could generate code that crashes. Reviewed-by: Trust-Me Task-number: QTBUG-11445 (cherry picked from commit ce2a273bab9b9094a1f0f3f60309797e11e59404)
| | * Fix double painting when adding an item into a linear layoutThierry Bastian2010-10-042-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the problem was that the item is first painted at its default position, then moved by the layout and finally repainted. We now made sure the item is laid out before the first paint event occurs. Task-number: QTBUG-13865 Reviewed-by: bnilsen (cherry picked from commit 33f525e636ef8fa64a15d3e66c56adaea0075bda)
| | * Fixed performance regression in curve stroking.Samuel Rødal2010-10-043-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change c46688b8a88da made us use m_curve_threshold for both QBezier::shifted and QBezier::toPolygon, and adjusted the threshold dynamically based on the painter scale. Since the threshold in shifted was already relative to the pen width, it is independent from the painter scale. Instead, we need to set a separate threshold for dashing. Also, in several places we were calling setCurveThresholdForTransform with the painter matrix even though we were transforming the points into device coordinate space before stroking. Task-number: QTBUG-13894 Reviewed-by: Gunnar Sletta (cherry picked from commit d60dc7cba21794866c9382f83080fab1a129eb08)
generated by cgit v0.12 at 2024-12-02 06:05:23 (GMT)