| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
for roman numbering of lists as supported by HTML/ODF
Reviewed-by: Olivier Goffart
Merge-request: 681
|
|
|
|
|
|
|
| |
QSyntaxHighlighter::rehighlightBlock()
Merge-request: 379
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
| |
Merge-request: 379
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
|
| |
For example when an unhandled key sequence (i.e. that has now shortcut
assosiated with it) like Alt-L is pressed, we shouldn't insert the 'L'
text from the QKeyEvent::text() into the text widget.
Reviewed-by: Thomas Zander
|
|
|
|
|
|
|
| |
I think I found two file descriptor that aren't closed. One seems like
a genuine leak, the other seems intentional.
Reviewed-By: ossi
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Also - Make winPeekMessage() & winPostMessage() obsolete
- FlashWindowEx, IsValidLanguageGroup functions no longer resolved
dynamically (available on >= Windows 2000)
- LoadIcon/LoadCursor -> LoadImage w/LR_SHARED for system
icons/cursors
- qsystemtrayicon_win: use Shell_NotifyIconGetRect if available
(Windows 7)
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|
|\
| |
| |
| |
| | |
Conflicts:
tests/auto/qsqldatabase/tst_databases.h
|
| |
| |
| |
| | |
Mismatch in preprocessor my previous commit.
|
| |
| |
| |
| | |
Reviewed-by: mae
|
| |
| |
| |
| |
| |
| |
| | |
It is only used for creating the bitmap context, so there is no reason
to keep it around.
Reviewed-by: Morten Sørvig
|
| |
| |
| |
| |
| |
| | |
Removed lots of places where we check for Tiger. Now we can assume it.
Reviewed-by: Morten Sørvig
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/ChangeLog
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
After discussing with some of the Objective-C
people I have finally got a fair number of the
warnings to disappear in both 10.5 and 10.6. I
also took the opportunity to remove a bunch of
other warnings.
Reviewed by: Morten Sørvig
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/sql/drivers/psql/qsql_psql.cpp
|
| |
| |
| |
| |
| |
| |
| | |
Re-enable fractional coordinates for text output, to produce the same
output as regular Carbon/ATSUI applications.
Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
|
| |
| |
| |
| | |
Reviewed-by: Samuel
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
private class member.
|
| | |
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
src/gui/text/qfontengine_win.cpp
tools/linguist/shared/cpp.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
This is covered by the autotest
tst_QTextDocument::receiveCursorPositionChangedAfterContentsChange()
Reviewed-by: con
|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| | |
seem fixable easily)
Merge-request: 594
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | | |
|
|/ / |
|
| |
| |
| |
| |
| | |
used character operations whenever possible
better usage of QLatin1String
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Task-number: 252489
|
| |
| |
| |
| | |
This is a small fix to 4af30f47c37fd0e6826aca2984dd0f567dc7e465
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
Wherever I found that we were using a string instead of a single char
I fixed the code.
Reviewed-by: olivier
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
If ensureSpace causes the layoutData to reallocate then the
initialGlyphs pointers will no longer be valid.
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|