summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.8-upstream' into master-waterWater-Team2011-07-0886-971/+885
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-07-0863-260/+652
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Applied fix (dea9ca8b7a4166e1c3d3fc374621ad02c1220d3a)from qt5/qtbase. Committing the qt-webpages.qdoc file with the online links Preparing documentation package for 4.8-beta Doc: Clarified the range of return values from QLineF::angle(). Doc: Fixed \since declarations. (cherry picked from commit 358e018dbb4b4dbdbfc702a6d462f113a1357e1e) Doc: Standardized on QtQuick for \since declarations. (cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731) Doc: Removed whitespace. (cherry picked from commit 01b3f508d1f7e9951baf60f487feadfa98ba4751) Modified \since command behavior slightly to handle project and version. Doc: Added a simple introduction to Qt and fixed links. (cherry picked from commit 9ed61311bce15b8f1bb4b30ee9133f1a2355f41d) Doc: Added more appropriate links to help reduce confusion. Doc: Removed non-ASCII characters from the documentation. (cherry picked from commit 1bd6f1bd280ee6e1ecd4de2291c8ccfb4d06b7a4) Doc: Updated documentation with \since 4.8 declarations.
| | * Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-0813949-1043539/+2123711
| | |\ | | | | | | | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc
| | * \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-044-23/+28
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Applied fix (dea9ca8b7a4166e1c3d3fc374621ad02c1220d3a)from qt5/qtbase. Committing the qt-webpages.qdoc file with the online links
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-teamDavid Boddie2011-07-044-3/+120
| | | |\ \
| | | | * | Committing the qt-webpages.qdoc file with the online linksJerome Pasion2011-07-041-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie <david.boddie@nokia.com>
| | | * | | Applied fix (dea9ca8b7a4166e1c3d3fc374621ad02c1220d3a)from qt5/qtbase.David Boddie2011-07-043-1/+6
| | | | | |
| | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-044-25/+142
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Preparing documentation package for 4.8-beta
| | | * | | Preparing documentation package for 4.8-betaJerome Pasion2011-07-044-25/+142
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -removed link to "What's New in Qt 4.7" -replaced online HTTP links with qhelp links -wrote material for "What's New in Qt 4.8" Reviewed by: David Boddie <david.boddie@nokia.com>
| | * | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-0139-259/+474
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: Doc: Clarified the range of return values from QLineF::angle(). Doc: Fixed \since declarations. (cherry picked from commit 358e018dbb4b4dbdbfc702a6d462f113a1357e1e) Doc: Standardized on QtQuick for \since declarations. (cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731) Doc: Removed whitespace. (cherry picked from commit 01b3f508d1f7e9951baf60f487feadfa98ba4751) Modified \since command behavior slightly to handle project and version. Doc: Added a simple introduction to Qt and fixed links. (cherry picked from commit 9ed61311bce15b8f1bb4b30ee9133f1a2355f41d) Doc: Added more appropriate links to help reduce confusion. Doc: Removed non-ASCII characters from the documentation. (cherry picked from commit 1bd6f1bd280ee6e1ecd4de2291c8ccfb4d06b7a4) Update 4.8.0 changes file Symbian socket engine: remove remaining todo comments Symbian: tune network autotest heap size so they can run on emulator Fix invalid read in QUrl::removeAllEncodedQueryItems Push the data together with the error in the synchronous case.
| | | * | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-07-018-10/+47
| | | |\ \
| | | * | | Doc: Clarified the range of return values from QLineF::angle().David Boddie2011-07-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-20197 (cherry picked from commit 86608d537eabc3cf7e1d1ddd1d0a2f90ccc2de2a)
| | | * | | Doc: Fixed \since declarations.David Boddie2011-07-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 358e018dbb4b4dbdbfc702a6d462f113a1357e1e)
| | | * | | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-07-0113-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731)
| | | * | | Doc: Removed whitespace.David Boddie2011-07-011-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 01b3f508d1f7e9951baf60f487feadfa98ba4751)
| | | * | | Modified \since command behavior slightly to handle project and version.David Boddie2011-07-019-202/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (The since argument can contain a project name and version, defaulting to the qdoc project if only a version number is specified.) Refactored common code into the Generator class. Fixed \sincelist HTML generation for tables containing only one item. (cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606)
| | | * | | Doc: Added a simple introduction to Qt and fixed links.David Boddie2011-07-015-5/+209
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 9ed61311bce15b8f1bb4b30ee9133f1a2355f41d)
| | | * | | Doc: Added more appropriate links to help reduce confusion.David Boddie2011-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-19919 (cherry picked from commit 26c29a2dd7efa4c66063d1255e1f694462cbae85)
| | | * | | Doc: Removed non-ASCII characters from the documentation.David Boddie2011-07-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 1bd6f1bd280ee6e1ecd4de2291c8ccfb4d06b7a4)
| | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-07-01303-2796/+5032
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (68 commits) Doc: Updated documentation with \since 4.8 declarations. Fix vertical positioning of glyphs in raster engine with FreeType Ensure a small event check interval on uikit platform. Change default application font for uikit platform. Use the QPoint memory layout change only on Desktop Mac Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservices Make it compile with openssl 1.0.0d, gcc 4.6 QStringBuilder: do not crash with null char* Add IPHONEOS deployment vars to makespec Post key events via QWindowSystemInterface, don't post events direcly Use nicer fonts and a few little patches to uikit platform. Update README and qmlapplicationviewer to suit 4.8. Updated proof-of-concept UIKit mkspecs Re-apply licenseheader text in source files for qt4.8 Fix event delevery order Reorder variable to eliminate warnings Only compare styleNames if they are not empty Add styleName to QFontDef comparison qsystemlibrary needs no special treatment QSocketNotifier autotest - fix compile with MSVC ...
| | | * | | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-3027-7/+99
| | | | | |
| | * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-teamQt Continuous Integration System2011-06-24131-1357/+2985
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (63 commits) my changelog for 4.8.0 Add a function that returns the D-Bus local machine ID Add an SSE4.2 even simpler version of toLatin1 Skip boundry neutral characters in bidi itemization symbian socket engine: resolve some fixme and todo items trivial: fix typo in comment Fix QDeclarativeInspector when starting with ,block changelog docu update for QNX 6.5 get rid of anacronysm massive improvements for the QNX screen driver massive improvements for the QNX mouse driver massive improvements for the QNX keyboard driver disable the Embedded Linux data directory permissions check for QNX skip two subtests that are known to fail on QNX implement POSIX IPC based QLock, QWSLock and QWSSharedMemory backends implement POSIX IPC based QSystemSemaphore and QSharedMemory backends add a configure-time check for an IPC support make QProcess really work on QNX make the kernel attempt to emulate an instruction with a misaligned access ...
| * | \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-07-0820-709/+213
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fix S60 compile Remove some metrics parsing code from Core Text Fix compilation with c++0x mode Fix Windows compile Move styleName out of QtFontStyle::Key Fix regressions in previous QFontDatabase patch Don't issue GL calls when the geometry is empty Fixed missing painting with X11 paint engine. Add font related changes in 4.8 into changes Store styleName in font database update 4.8.0 changes file Fix resource leak in QFontEngineDirectWrite Fix transformations on DirectWrite rasterized text Remove openvglite plugin
| | * | | | | Merge remote branch 'mainline/4.8' into stagingJiang Jiang2011-07-0813949-1043539/+2123710
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.8.0
| * | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2011-07-073-2/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Update the Window title when closing the last tab. On symbian QMessageBox does not look like native dialog Fix bidi reordering when part of text is rendered by fallback font
| | * \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-073-2/+20
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-07-071-0/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update the Window title when closing the last tab.
| | | | * | | | | | Update the Window title when closing the last tab.Casper van Donderen2011-07-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-20243 Reviewed-By: Kevin Wright
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-07-061-1/+13
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix bidi reordering when part of text is rendered by fallback font
| | | | * | | | | | | Fix bidi reordering when part of text is rendered by fallback fontEskil Abrahamsen Blomfeldt2011-07-061-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the fallback font is used for part of a RTL text, we need to position the different text items accordingly, subtracting the advance instead of adding it. Task-number: QTBUG-17117 Done-with: Lars
| | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-07-061-1/+6
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: On symbian QMessageBox does not look like native dialog
| | | | * | | | | | | | On symbian QMessageBox does not look like native dialogSami Merila2011-07-061-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If API QMessageBox::setInformativeText() is used to set informative text to the messagebox, the text is added to the "icon column", which makes the messagebox look really weird. Use layoutDirection() and add informative text to the same column where other text elements are added. Task-number: QTBUG-9924 Reviewed-by: Tomi Vihria
| | | | | | | * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-0612-69/+104
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix S60 compile Remove some metrics parsing code from Core Text Fix compilation with c++0x mode Fix Windows compile Move styleName out of QtFontStyle::Key Fix regressions in previous QFontDatabase patch Don't issue GL calls when the geometry is empty Fixed missing painting with X11 paint engine. Add font related changes in 4.8 into changes Store styleName in font database
| | | | | | | | * | | | | Fix S60 compileJiang Jiang2011-07-061-1/+1
| | | | | | | | | | | | |
| | | | | | | | * | | | | Remove some metrics parsing code from Core TextJiang Jiang2011-07-062-20/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The respective value in some of the default fonts like Lucida Grande are simply not reliable. It seems that the only reliable way to get such information is by going through all the glyphs. It seems that these code are not well tested on Mac and should be removed for now since it caused visible regressions in QLineEdit rendering. Reviewed-by: Eskil
| | | | | | | | * | | | | Fix compilation with c++0x modeLars Knoll2011-07-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier
| | | | | | | | * | | | | Fix Windows compileJiang Jiang2011-07-061-1/+1
| | | | | | | | | | | | |
| | | | | | | | * | | | | Move styleName out of QtFontStyle::KeyJiang Jiang2011-07-065-46/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes the code clearer and more explicit. Reviewed-by: Eskil
| | | | | | | | * | | | | Fix regressions in previous QFontDatabase patchJiang Jiang2011-07-051-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. QtFontStyle::Key comparison should either use styleName or style, etc., but not both. 2. When initializing a QFont from QFontDatabase::font(), style and weight parameters should always be set even when we found a match styleName, in case these parameters will be used for comparison later. Reviewed-by: Eskil
| | | | | | | | * | | | | Don't issue GL calls when the geometry is emptyEskil Abrahamsen Blomfeldt2011-07-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works as a band-aid and optimization for QT-5104, because in the text in the example, which contains latin text and has a latin default font set, will think of all spaces between the cyrillic characters as latin characters, hence it will make separate text items for them and issue separate glDrawElements() calls. By cutting off if there are no glyphs to draw, we can avoid hitting the actual bug for this and several other use cases, making it less likely to happen. Task-number: QT-5104 Reviewed-by: Samuel
| | | | | | | | * | | | | Fixed missing painting with X11 paint engine.Samuel Rødal2011-07-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-introduce some "lost" code from 4.7. Task-number: QTBUG-19639 Reviewed-by: Olivier Goffart
| | | | | | | | * | | | | Add font related changes in 4.8 into changesJiang Jiang2011-07-041-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Eskil
| | | | | | | | * | | | | Store styleName in font databaseJiang Jiang2011-07-043-12/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that queries like QFontDatabase::styles() can return exactly the same styles as the system does. Then application can use QFont::setStyleName() to select those styles later. With a lot of fonts not providing correct numeric weight/width values and even if they did, values are usually not directly mapped to QFont enums, styleName is probably the only reliable way to select any possible font in the system. Task-number: QTBUG-13518 Change-Id: Id8a9469b804f1b5bb81d8c7378e7e8778f9a4fff Reviewed-on: http://codereview.qt.nokia.com/739 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| | | | | | | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-07-018-11/+51
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: update 4.8.0 changes file Update 4.8.0 changes file Symbian socket engine: remove remaining todo comments Symbian: tune network autotest heap size so they can run on emulator Fix invalid read in QUrl::removeAllEncodedQueryItems Push the data together with the error in the synchronous case.
| | | | | | | | * | | | | update 4.8.0 changes fileaavit2011-07-011-1/+4
| | | | | | | | | | | | |
| | | | | | | | * | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-07-018-10/+47
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | |_|_|/ | | | | | | | | | |/| | |
| | | | | | | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-301-2/+3
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix resource leak in QFontEngineDirectWrite
| | | | | | | | * | | | | Fix resource leak in QFontEngineDirectWriteEskil Abrahamsen Blomfeldt2011-06-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug introduced by f54c5d9133d7aa7636988db36fa6cc51d26434b6. The release statement has to come before the return statement :) Reviewed-by: Jiang Jiang
| | | | | | | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-302-47/+104
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Fix transformations on DirectWrite rasterized text
| | | | | | | | * | | | | Fix transformations on DirectWrite rasterized textEskil Abrahamsen Blomfeldt2011-06-302-47/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a few bugs in the DirectWrite font engine that caused transformed text to break. First of all, alphaMapForGlyph() ignored the transform, so no gray antialiased text would be transformed. Second of all, the imageForGlyph() function would use the wrong bounding box for the rasterized glyph, causing its positioning to become a little bit off when rotating. The fix is to get the bounding box from the system and add a margin to this instead of trying to predict how it will appear after the vertical hinting etc. has been applied. So that the positioning metrics are in sync with the actual metrics used by the alphaMap* functions, we also need to implement the alphaMapBoundingBox() function. Task-number: QTBUG-19829 Reviewed-by: Jiang Jiang
generated by cgit v0.12 at 2025-09-15 11:39:53 (GMT)