summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix bidi reordering of RTL text with embedded imagesEskil Abrahamsen Blomfeldt2011-08-161-2/+0
| | | | | | | | | | According to the UBA, the object replacement character should be considered ON. There's no reason to special case its directionality, as the bidi algorithm will already have given it an implicit directionality. Task-number: QTBUG-20910 Reviewed-by: Lars
* Fixed infinite loop when loading certain SVGs.Kim Motoyoshi Kalland2011-08-151-1/+1
| | | | | Task-number: QTBUG-16216 Reviewed-by: aavit
* Minor optimizations for QTextEngineRitt Konstantin2011-08-081-17/+25
| | | | | | | | | Optimize script assignment, skip calls to QUnicodeTables::script() for the codepoints handled explicitly. Make the helper functions of QTextEngine::elidedText() inlined Merge-request: 1298 Reviewed-by: yoann
* uikit: Use release Qt for simulator, update READMEEike Ziller2011-08-053-83/+103
|
* Automatic closing of input panel on uikit when QML item looses focus.Eike Ziller2011-08-053-6/+65
| | | | | | | | | | | I.e. we remember which item had focus when we got the request to open the input panel, and close it when that looses focus, even if we don't get an explicit close request. Also set the "returnKey" to "Return" instead of "Done" if the focus item is a TextEdit. This adds a dependency of the platform plugin to declarative.
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-08-033-23/+40
|\ | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixed compile error in qwindowsurface_qws.cpp. Fixed regression introduced by 5842d19cf3dff37a85c. Fix gamma corrected source color in GL
| * Fixed compile error in qwindowsurface_qws.cpp.Samuel Rødal2011-08-031-1/+1
| | | | | | | | | | Task-number: QTBUG-20713 Reviewed-by: Jørgen Lind
| * Fixed regression introduced by 5842d19cf3dff37a85c.Samuel Rødal2011-08-031-4/+9
| | | | | | | | | | | | We need a normalized rectangle. Reviewed-by: aavit
| * Fix gamma corrected source color in GLJiang Jiang2011-07-291-18/+30
| | | | | | | | | | | | | | | | | | GL_EXT_framebuffer_sRGB expects linear RGB as input color, thus we need to convert sRGB based input color into linear RGB first before using glBlendColor with it. Task-number: QTBUG-20574 Reviewed-by: Samuel Rødal
* | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-08-0346-230/+1922
|\ \
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-08-021-0/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: QLabel documentation: add warning about sanitizing input
| | * | QLabel documentation: add warning about sanitizing inputPeter Hartmann2011-08-021-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | make users more aware of QLabel guessing the text format. Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-08-022-2/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Revert "fix QFileInfo::isSymLink() for NTFS mount points" Fix typo for ifdef QT_NO_ACCESSIBILITY Call QAccessible::updateAccessibility when a widget is deleted Don't include qdbusvirtualobject header twice.
| | * | | Revert "fix QFileInfo::isSymLink() for NTFS mount points"Jiang Jiang2011-08-011-1/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 70a434dc1c24f306805900b5ad7a45c7272702c6.
| | * | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-296-31/+88
| | |\ \ \
| | * | | | Fix typo for ifdef QT_NO_ACCESSIBILITYFrederik Gladhorn2011-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | Call QAccessible::updateAccessibility when a widget is deletedJosé Millán Soto2011-07-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1310 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| | * | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-271-2/+34
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-262-0/+79
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-252-6/+10
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-232-2/+5
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-226-8/+97
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.8-upstream' into master-waterWater-Team2011-07-2118-64/+257
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Don't include qdbusvirtualobject header twice.Frederik Gladhorn2011-07-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was in the public and private headers section. Reviewed-by: Thiago
| | * | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-07-2015-20304/+40039
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-08-0143-228/+1910
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Make macdeployqt more robust against usage of symbolic links. Document support for Linguist on Mac. Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle. Guard macdeployqt against @rpath and @loader_path too. Fix typo. OpenVG cleanup. Include trailing space width in RTL text line width Fix the compilation error when QT_NO_PLUGIN_CHECK was set. Fixed holes in border image drawing by introducing new API. Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2. Revert "fix QFileInfo::isSymLink() for NTFS mount points" Remove debug output. Add some sound support to the uikit platform. Add flickrdemo uikit example project. Fix uikit simulator build. Get subpixel antialiasing again w/combo of raster and affine transform Add initial support for bitmap version 4/5 headers. optimize QRawFont::supportsCharacter() Switch to use floating point pixelSize in QRawFont completely Add a way to check if we have a matching family in the database.
| | * | | | | | | | | | OpenVG cleanup.Nikolaos Korkakakis2011-07-262-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes needed to reflect the updates in the QWindowSurface. Merge-request: 1309 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | | | | | | | Include trailing space width in RTL text line widthJiang Jiang2011-07-261-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15511 Reviewed-by: Eskil
| | * | | | | | | | | | Fix the compilation error when QT_NO_PLUGIN_CHECK was set.Nikolaos Korkakakis2011-07-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 1307 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | | | | | | | Fixed holes in border image drawing by introducing new API.Samuel Rødal2011-07-2610-148/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rasterizing two adjacent QRectFs it's important that the shared x or y-edges have the exact same coordinates, or there might be a hole or an overlapping pixel when they are rasterized. Since the drawPixmapFragments API was based on a center position and a scale, it can not be used for this purpose, as the in the situation of two horizontally adjacent rectangles the right edge of the left-most rect and the left edge of the right-most edge are computed differently. Thus rounding errors can cause them to not be equal, especially when there's also a scaling / translating painter transform involved. Thus, to not sacrifice performance, we need to introduce a new drawPixmapFragments API that's simply takes an array of target rectangles and an array of source rectangles. It should give a slight performance boost for the border pixmap use case as well, since there are less floating point multiplications / divisions involved. Task-number: QTBUG-19079 Reviewed-by: Kim
| | * | | | | | | | | | Properly resolve and use glMapBuffer / glUnmapBuffer on GLES2.Samuel Rødal2011-07-263-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though we're able to resolve the function pointers, the spec says we have to check for the GL_OES_mapbuffer extension before we use them. Fixes a crash on a platform that doesn't advertise the extension but still resolves the function pointers. Reviewed-by: Kim
| | * | | | | | | | | | Revert "fix QFileInfo::isSymLink() for NTFS mount points"Jiang Jiang2011-07-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 70a434dc1c24f306805900b5ad7a45c7272702c6.
| | * | | | | | | | | | Remove debug output.Eike Ziller2011-07-261-1/+0
| | | | | | | | | | | |
| | * | | | | | | | | | Add some sound support to the uikit platform.Eike Ziller2011-07-2510-29/+827
| | | | | | | | | | | |
| | * | | | | | | | | | Add flickrdemo uikit example project.Eike Ziller2011-07-255-0/+638
| | | | | | | | | | | |
| | * | | | | | | | | | Get subpixel antialiasing again w/combo of raster and affine transformEskil Abrahamsen Blomfeldt2011-07-251-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert part of hot fix 48ff7e5af99923396243940979d15d4ec2e2730c since it is no longer needed in Qt 4.8 due to the introduction of a separate code path for the FreeType case in drawCachedGlyphs(). This is also explained in the description for that commit. The consequence of the commit was that subpixel antialiasing would be turned off for all text drawn with a transformation and the raster engine. In the past this was not the case, it is however the case in several other paint engine, so the regression was deemed okay to hot fix the original problem. In Qt 4.8 the original problem has been fixed properly. Task-number: QTBUG-16205 Reviewed-by: Jiang Jiang
| | * | | | | | | | | | Add initial support for bitmap version 4/5 headers.Ilya Konkov2011-07-221-9/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The headers are just skipped, information stored in them is ignored. Merge-request: 824 Reviewed-by: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
| | * | | | | | | | | | optimize QRawFont::supportsCharacter()Ritt Konstantin2011-07-222-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a single UCS-4-encoded codepoint could morph into 1 or 2 UCS-2-encoded codepoints only; thus, allocating QString just to parse it could be avoided and the well-defined UCS-4 to UCS-2 arithmetic could be used instead Merge-request: 1305 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| | * | | | | | | | | | Merge remote branch 'mainline/4.8'Jiang Jiang2011-07-22106-20586/+41489
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Switch to use floating point pixelSize in QRawFont completelyJiang Jiang2011-07-217-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Eskil
| | * | | | | | | | | | | Add a way to check if we have a matching family in the database.Pierre Rossi2011-07-212-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed in order to get proper font fallback, and incidentally webfonts, working in QtWebKit. See: https://bugs.webkit.org/show_bug.cgi?id=55036 Internal for now, maybe it could be made public for a future release. Task-number: QTBUG-15575 Change-Id: I5c454689125cd9d5fda26ff2149208ed1beec24d Reviewed-on: http://codereview.qt.nokia.com/1829 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | | | | | | | | | | | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-08-021-21/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-08-021-21/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Detect linked fonts by name (insead of via CLinkedTypeface* Api)
| | * | | | | | | | | | | | Detect linked fonts by name (insead of via CLinkedTypeface* Api)Alessandro Portale2011-08-021-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The detection of Linked Fonts via CLinkedTypeface* Api does not work in all cases. It works in QML apps, but not in QWidgets based apps. The reason is still unclear. This commit replaces the CLinkedTypeface* Api based code of commit fa344b355d311fce7954e2fd1a22a87a88194783 whith a simple type face anme analysis. Assumption is that the names of Linked Fonts always end with "LF" and are all upper case. This patch has been tested by more people than just me, but it is too dirty to mention the others as reviewer. I take the shame and blame. Task-Number: QTBUG-20007
* | | | | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-296-31/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoasharedwindowmethods_mac_p.h src/gui/text/qfont_s60.cpp
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-07-281-12/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert binary search in QTextEngine::findItem
| | * | | | | | | | | | | | Revert binary search in QTextEngine::findItemJiang Jiang2011-07-281-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's part of c9607f069f0fb98021daf0af9f1d1b2981018e0c which caused crash in certain cases. Task-number: QTBUG-17209 Reviewed-by: Gunnar Sletta
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-07-271-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove a duplicate include line
| | * | | | | | | | | | | | Remove a duplicate include lineLiang Qi2011-07-271-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build Qt 4.7 for Symbian on Mac/gcce again. Reviewed-by: Honglei Zhang
| * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-07-273-9/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Save previous font engine for right bearing adjustment Fix compilation under OSX 10.7 or using llvm-gcc. Fix typo in QFontDialog docs Reset previousGlyph once we reached a new text item
generated by cgit v0.12 at 2025-02-09 02:15:21 (GMT)