summaryrefslogtreecommitdiffstats
path: root/src/gui/text
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-1989-202/+199
|\ | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| * Use QTransform more efficiently.Bjørn Erik Nilsen2009-06-181-6/+3
| | | | | | | | Reviewed-by: Samuel
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-1689-178/+178
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1689-178/+178
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Merge commit 'origin/4.5'Bjørn Erik Nilsen2009-06-121-18/+18
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm
| | * Fixed a problem with disappearing borders in a QTextFrame.Trond Kjernåsen2009-06-111-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | The border was always drawn before the background, and if there were both a border and background brush set, the background ended up being drawn ontop of the border. Task-number: 255868 Reviewed-by: Samuel
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-114-54/+47
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/gui/graphicsview/qgraphicswidget.cpp src/gui/painting/qdrawutil.cpp src/gui/painting/qpainterpath.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * | Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-112-19/+19
| | |
| * | refactor of private getters for the mode i item widget classesThierry Bastian2009-06-111-6/+4
| | |
| * | Makes the ODF writer use one text:tab tag for each tab, per ODF spec.Thomas Zander2009-06-111-28/+23
| | | | | | | | | | | | | | | | | | | | | | | | We used tab-ref to place multiple tabs compressed into one tag just like text:s does, but thats not what the spec says. We now don't sum up tabs anymore but just simply write out one "<text:tab/>" tag per tab. Task: 249110
| * | removed superflous indirection (ie. using q->..) instead of using theThierry Bastian2009-06-101-1/+1
| | | | | | | | | | | | private class member.
* | | Merge commit 'qt/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-106-52/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qabstractitemmodel.cpp src/corelib/kernel/qobject.cpp tools/qdoc3/htmlgenerator.cpp
| * | small changes in private headersThierry Bastian2009-06-093-9/+2
| | |
| * | small improvement/refactor to cssparserThierry Bastian2009-06-092-42/+1
| | |
| * | small change to reduce static data sizeThierry Bastian2009-06-091-1/+1
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-097-18/+41
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp tools/qdoc3/tree.cpp
| * | Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-082-12/+15
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
| | * Fixed text drawing on Windows in 16 bit mode.Trond Kjernaasen2009-06-052-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were several problems with antialiased text in 16 bit mode under Windows. No gamma correction was done, yet we prepared the cached glyphs for gamma correction. The mask format we rendered the glyphs into was also set to the desktop depth, which implied that information was lost and the text looked rather odd. Reviewed-by: Samuel BT: yes
| * | Revert signal emission order in QTextDocument to 4.5 behaviourmae2009-06-082-3/+11
| | | | | | | | | | | | | | | | | | | | | This is covered by the autotest tst_QTextDocument::receiveCursorPositionChangedAfterContentsChange() Reviewed-by: con
| * | Fix QT_NO_DATASTREAM macro checks and improve readabilityRitt Konstantin2009-06-082-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Some checks where in the wrong locations, and some endifs where hard to read. Merge-request: 611 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| * | Fixes anti-aliased text rendering on smartphones (Windows Mobile)Thomas Hartmann2009-06-051-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for cleartype in qt_win_read_cleartype_settings() was not correct for Windows Mobile For anti-aliased text rendering we also have to use another pixel format for the native image. Task-number: 249642 Reviewed-by: mauricek
| * | All of Qt's own code compiles with -pedantic now (but pcre and webkit don't ↵David Faure2009-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | seem fixable easily) Merge-request: 594 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | | Merge commit 'mainline/master' into kinetic-declarativeuiBjørn Erik Nilsen2009-06-042-9/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/gui/math3d/qmatrix4x4.cpp src/gui/math3d/qmatrix4x4.h tools/qdoc3/htmlgenerator.cpp
| * | Merge branch '4.5'Denis Dzyubenko2009-06-022-9/+2
| |\ \ | | |/
| | * BT: Remove duplicate code and fix font parsing.Norwegian Rock Cat2009-06-022-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFont has a feature that you can pass a comma-separated list and it will walk through the list and match the font that it hits first. There's a nice static function that X11 and Windows uses, but the Mac was using an older copied version of it. This old version didn't handle quoting which is what happens in the style sheet. So, using the same code makes everything work well. As a bonus, Creator looks correct again. Reviewed-by: Simon Hausmann
* | | Compilation fix on MSVCThierry Bastian2009-06-021-1/+1
|/ / | | | | | | Reviewed-by: alexis
* | Integrate merge-request #548 into branch 'master'Norwegian Rock Cat2009-05-281-2/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Brad Hards (2): Remove duplicate qpdf_p.h include. Fix build when compiling Qt using -no-opengl configuration. Request-url: http://gitorious.org/qt/qt/merge_requests/548 Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
| * | Remove duplicate qpdf_p.h include.Brad Hards2009-05-281-2/+0
| | |
* | | oops, build was broken on embeddedThierry Bastian2009-05-281-1/+1
|/ /
* | improved string operations all over the placeThierry Bastian2009-05-286-26/+25
| | | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-274-20/+23
|\ \ | |/ | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * BT: Fixed GL textdrawing in the Boxes demo.Trond Kjernaasen2009-05-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reworked the 85f98acaa3a38079071bea711e43c9a86edec1f6 fix, since it broke glyph positioning in the GL engine under Windows. Instead of changing the glyph cache margin, which impacts where the glyph is positioned, we just make the image the glyph is drawn into 4 pixels bigger in width/heigth. The margin in QImageTextureGlyphCache needs to be reworked.. Task-number: 254450 Reviewed-by: Eskil
| * Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-251-6/+6
| | | | | | | | Reviewed-by: Trust Me
| * qdoc: Added some missing qdoc comments.Martin Smith2009-05-252-11/+14
| | | | | | | | Task-number: 252489
* | Restore undo compression for cut/del of selectionsmae2009-05-271-25/+32
| | | | | | | | This is a small fix to 4af30f47c37fd0e6826aca2984dd0f567dc7e465
* | some cleanups on private exported symbolsThierry Bastian2009-05-264-11/+7
| |
* | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-257-23/+23
| | | | | | | | | | | | | | Wherever I found that we were using a string instead of a single char I fixed the code. Reviewed-by: olivier
* | Merge branch '4.5'Thiago Macieira2009-05-222-15/+29
|\ \ | |/
| * Fixed potential bug caused by change b89efc8e7f32.Samuel Rødal2009-05-221-1/+1
| | | | | | | | | | | | | | If ensureSpace causes the layoutData to reallocate then the initialGlyphs pointers will no longer be valid. Reviewed-by: Simon Hausmann
| * Fixed text shaping bugs with ligatures and multiple font engines.Samuel Rødal2009-05-221-14/+26
| | | | | | | | | | | | | | | | If Harfbuzz shaping adds or merges glyphs we need to move the remaining glyphs in the glyph layout to compensate. Task-number: 253783 Reviewed-by: Simon Hausmann
| * Fixed an issue with text drawing to QImages on Mac/Cocoa.Trond Kjernåsen2009-05-221-1/+3
| | | | | | | | | | | | | | | | | | | | We currently don't support subpixel hinting when drawing text to a QImage on Mac. The alpha map that is returned by the font engine is a plain 8 bit gray mask, which means we have to switch off subpixel hinting when we draw the glyph for caching. Task-number: 249178 Reviewed-by: Samuel
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-192-2/+2
|\ \ | |/
| * Fix some typos in the documentation.Frederik Schwarzer2009-05-182-2/+2
| | | | | | | | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-181-7/+12
|\ \ | |/ | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| * QCss: font-family handle fallback font specsOlivier Goffart2009-05-181-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | if one specify more than one parameter in font-family, e.g., font-family: Verdana, Arial Qt should fallback on the second font if the first cannot be found. QFont::setFamily handle the case when the family name contains a comas, so we do not need to handle that specially in the css parser code. Task-number: 252311 Reviewed-by: Thomas Zander
* | Fix compilation of the cssparser testOlivier Goffart2009-05-181-3/+3
| | | | | | | | | | the Q_GUI_EXPORT macro have been removed, but we still need to export the classes for the test
* | Merge branch '4.5'Thiago Macieira2009-05-141-3/+3
|\ \ | |/ | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| * Fixed an issue with text drawing under Windows.Trond Kjernaasen2009-05-141-3/+3
| | | | | | | | | | | | | | | | | | | | Some text drawn with OpenType fonts where cut off by a pixel or two under certain circumstances. This adds an additional 2 pixel pad margin to the glyph cache entries. The padding behaves slightly different when ClearType is enabled/disabled, hence the general 2 pixel padding. Task-number: 246196 Reviewed-by: Samuel
* | Merge commit 'origin/4.5'Olivier Goffart2009-05-131-1/+1
|\ \ | |/
| * Made QFontEngineFT compile on 64-bit platforms with legacy headers.Samuel Rødal2009-05-111-1/+1
| | | | | | | | | | | | | | | | | | In older Freetype headers FT_LCD_FILTER_DEFAULT is apparently defined to be ((const FT_Byte*)(void*)(ft_ptrdiff_t)1), which leads to a compile error due to precision loss when casting to int. Task-number: 253186 Reviewed-by: Trond
generated by cgit v0.12 at 2024-10-25 07:23:31 (GMT)