summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Keep other text format with QTextOption::SuppressColors tag on"Jiang Jiang2010-09-221-6/+2
| | | | This reverts commit 22ee6863458885c900e8294a44bd782acbdd8201.
* Fixed stencil buffer on FBOs with OpenGL ES.Kim Motoyoshi Kalland2010-09-222-27/+79
| | | | | | | | If combined depth-stencil buffer is not supported, create separate depth and stencil buffers. Task-number: QTBUG-12861 Reviewed-by: Trond
* Keep other text format with QTextOption::SuppressColors tag onJiang Jiang2010-09-221-2/+6
| | | | | | | | | | Setting the QTextOption::SuppressColors tag on a QTextDocument breaks all text format, not just colors. This patch fix this by selectively ignoring color properties in the format and keeping other properties. Task-number: QTBUG-13090 Reviewed-by: Eskil
* QTreeView: do not scroll to top if last item is removedFrank Reininghaus2010-09-222-0/+26
| | | | | | | | | | | | | When the last item is the current item and is removed, QTreeViewPrivate::updateScrollBars() is called after QTreeViewPrivate's viewItems member is cleared. This commit makes sure that viewItems is restored by calling QTreeView::doItemsLayout() in this case, preventing that the scroll bar range is set to zero temporarily and the view is scrolled to the top unexpectedly (this was a regression in 4.7.0: QTBUG-13567). Merge-request: 2481 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-2228-131/+96
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (105 commits) Fixed drawing a large number of glyphs with the same font under GL. Bump version to 4.7.1. Qt headers must be included before X11 headers Fixes bezier curves not being drawn when it is a line. Avoid creating copy of an image in memory when storing as jpeg QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian Add exception barrier to QCertificateRetriever::RunL() Reference correct declarative elements page. QtWebKit: Update tag files to match the same content on qtwebkit.git QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit. QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit. Doc: updating the qdocconf files and the stylesheet Doc: updating details on Tier 2 platforms Doc: adding remark on release of qt quick element support in creator Update configure.exe Revert "let WebKit inject itself into the qt configuration" Revert "fix qt_webkit_version.pri install for in-Qt builds" Revert "Fixed incorrect Symbian scoping." QS60Style: Itemviews are drawn incorrectly Change to commercial license headers in preparation for release. ...
| * Fixed drawing a large number of glyphs with the same font under GL.Trond Kjernåsen2010-09-214-9/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Our glyph caching system doesn't take GL texture size limitation into account, and assumes you can create an infinitely large texture. On top of that, the cache will never create a cache that is wider than 256, or QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH, which means we'll hit the texture size limit even faster. With this patch the entire texture is utilized. However, to fix in properly we need to support having multiple texture for each font engine. That will be fixed shortly (see task QTBUG-13784). Task-number: QT-3971 Reviewed-by: Eskil
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jason McDonald2010-09-213-72/+16
| |\
| | * Qt headers must be included before X11 headersBenjamin Poulain2010-09-211-3/+3
| | | | | | | | | | | | | | | | | | | | | X11 symbols are conflicting with some of the Qt ones. Qt headers needs to be included before the X11 ones in order to compile on Maemo. Reviewed-by: Samuel Rødal
| | * Fixes bezier curves not being drawn when it is a line.Yoann Lopes2010-09-211-41/+0
| | | | | | | | | | | | | | | | | | | | | Some old work-around code is no longer needed... Task-number: QTBUG-13721 Reviewed-by: Samuel
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-09-210-0/+0
| | |\
| | * | Avoid creating copy of an image in memory when storing as jpegaavit2010-09-211-28/+13
| | | | | | | | | | | | | | | | | | | | Task-number: QT-3871 Reviewed-by: Kim
| * | | Bump version to 4.7.1.Jason McDonald2010-09-2121-50/+50
| | |/ | |/| | | | | | | Reviewed-by: Trust Me
| * | Merge commit 'v4.7.0' into 4.7Jason McDonald2010-09-210-0/+0
| |\ \ | | |/ | |/|
| | * 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)
| | * Reference correct declarative elements page.Jesper Thomschutz2010-09-091-1/+1
| | | | | | | | | | | | | | | Done-by: Morten Rev-by: Jesper
| | * 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)
| | * Doc: updating the qdocconf files and the stylesheetMorten Engvoldsen2010-09-0813-104/+124
| | | | | | | | | | | | | | | | | | | | | QDocconf files was out of date in the section including extra files Style now shows numbered lists corectly (cherry picked from commit cbba0a1ea1e727cca4ca09c216e4f5a306083ba4) (cherry picked from commit 288e8a2cd4be9033af39fb5d309e855a582081bd)
| | * Doc: updating details on Tier 2 platformsMorten Engvoldsen2010-09-081-5/+4
| | | | | | | | | | | | | | | (cherry picked from commit 6b0e60a2f70acd7daab068443e26741b7c44db63) (cherry picked from commit 6c78c125f7201e146f43d74d90256ee97835cbd9)
| | * Doc: adding remark on release of qt quick element support in creatorMorten Engvoldsen2010-09-081-1/+2
| | | | | | | | | | | | | | | (cherry picked from commit 5d044a343e398386940ac5e4c968d1bdbe127427) (cherry picked from commit 59ac4997c3c0759fccc39a0f1c72d95ab065059a)
| | * Merge branch '4.7.0' of scm.dev.nokia.troll.no:qt/qt-releases into 4.7.0Toby Tomkins2010-09-088-37/+23
| | |\
| | | * Revert "let WebKit inject itself into the qt configuration"Jason McDonald2010-09-088-16/+10
| | | | | | | | | | | | | | | | 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.
| | * | Update configure.exeToby Tomkins2010-09-081-0/+0
| | |/
| | * 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-077202-93816/+93816
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Increase maximum heap size of minehunt demo to fix crashing on SymbianJoona Petrell2010-09-071-0/+1
| | | | | | | | | | | | | | | | | | Task-number: QT-3821 Reviewed-by: Martin Jones (cherry picked from commit 3113a91f50f12c8ee53f2e84f6b46fde6c2c1693)
| | * Merge branch '4.7.0' of scm.dev.nokia.troll.no:qt/qt-releases into 4.7.0Jason McDonald2010-09-0712-3890/+3795
| | |\
| | | * Recreate Qt 4.7.0 def files over Qt 4.6.3Joona Petrell2010-09-0712-3890/+3795
| | | |
| | * | Doc: Adds line about non-support for Webkit on SolarisMorten Engvoldsen2010-09-071-1/+2
| | | | | | | | | | | | | | | | (cherry picked from commit 82ff6626eaabbaed83f3cdfc429a2d011701ba03)
| | * | Doc: Updating the 3rd party lib used in Qt - including JQueryMorten Engvoldsen2010-09-071-0/+32
| | | | | | | | | | | | | | | | (cherry picked from commit fcf01687c7209f2b4222bd12d8fe4a871380e65b)
| | * | Doc: Fixing links on index page and corecting HTML in the template.Morten Engvoldsen2010-09-072-2/+2
| | |/ | | | | | | | | | (cherry picked from commit 78381dbc9701015aef43736fb7d22cf6e66984c7)
| | * 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-078-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * Doc: Updated Supported Platforms page. FinishedMorten Engvoldsen2010-09-071-22/+20
| | | | | | | | | | | | (cherry picked from commit adcd745d6ef2dbd68a28e932e2a8961b70bece09)
| | * 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-062-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| | * qdoc: Ensured that text is encoded correctly.David Boddie2010-09-061-9/+9
| | | | | | | | | | | | (cherry picked from commit 9986c3f0c0681c7ea8bc8e5cfea5662880db6654)
| | * qdoc: Fixed non-well-formed markup.Jason McDonald2010-09-062-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me To-be-really-reviewed-by: Qt Doc Team (cherry picked from commit 3833dc0a0535fa8320e17c741ca2746e9bebcaa9) Conflicts: tools/qdoc3/htmlgenerator.cpp
| | * 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)
| | * Adding missing imageKevin Wright2010-09-061-0/+0
| | | | | | | | | | | | (cherry picked from commit 7f9205aa572c60085c9e9f38749bb48e707fea95)
| | * 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-0337-1623/+30
| | | | | | | | | | | | (cherry picked from commit a02eba0de0fcf9a17d489ee1f92977c95d3afd76)
generated by cgit v0.12 at 2025-08-25 19:25:04 (GMT)