| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Reviewed-by: hjk
|
|\
| |
| |
| |
| |
| | |
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix potential crash when clicking in a text edit
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since the attributes() call might resize the layout and therefore
delete the previous data, the logClusters pointer might be dangling
at this point. We need to reget it to make sure it's valid.
Task-number: QTBUG-20310
Reviewed-by: Jiang Jiang
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Compensate for different rounding rule in CG engine
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
After we switched to fractional metrics, Core Graphics engine
always put text at floored vertical postion, while underlines
will be rounded after 0.75. Ceiling the underline position will
make sure it will always leave the underline pixels given.
Task-number: QTBUG-19959
Reviewed-by: Eskil
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Check engine existence before increasing reference count
Keep reference count for cached font engines in QTextEngine
Optimize text layout.
Fix crash when app font is added
|
| | |
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
(cherry picked from commit 244620438700464a862ceab7c881974a5b1d1fea)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
So that if these font engines are deallocated elsewhere (by
QFontCache for instance), we can still access them in QTextEngine.
Task-number: QTBUG-17603
Reviewed-by: Eskil
(cherry picked from commit 6e23fb69e441871829765ff512e90fed17b6798d)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When laying out text, a significant amount of time was being spent
querying for the font engine. This patch:
* changes the layout to only query for the engine when a new script item
is encountered.
* adds an internal cache of the previous result to
QTextEngine::fontEngine(). This catches the important case of multiline
text with few font engine changes.
With these changes layout costs are now approximately 60% of what they
were previously, as measured by the text layout benchmarks.
Reviewed-by: Eskil Abrahamsen Blomfeldt
(cherry picked from commit 0c56bef89b6e3fe4c9fb32eb8b51a6ea316a89fa)
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Loading app fonts will clear the application font cache, but
QFontPrivate::engineWithScript will try to load the font again,
in Mac the font engine used here must be the one used for shaping,
because subsequent sub font engines may be added to it during the
shaping process (QCoreTextFontEngineMulti::stringToCMap). That is
why we need to fetch the font engine directly from QTextEngine's
fontEngine cache instead of QFontCache.
Task-number: QTBUG-20250
Reviewed-by: Eskil
(cherry picked from commit 1f90ae36cff8acf581d1624bf011fe3a55c623c0)
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Backporting fix for QTBUG-18716
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Provide internal API to avoid automatic translation of input widget
There will be cases when client will want to disable splitview
automatic view translation, so that keyboard is just brought on top of
the application and no other actions happen. There will be no new
public Qt GUI API to cover the cases (the public API will come from
QML Components), but the implementation is done with new private API.
Task-number: QTBUG-20171
Reviewed-by: Honglei Zhang
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fix compiler warning in qtextdocument.cpp
Fix crash when app font is added
Use truncate only for subpixel boundingBox x position
Use more numerically robust algorithm to compute QBezier::pointAt().
Fix editable combobox style on Mac
Revert 344a4dcfe and part of 93bce787
Fix raster subpixel positioning in Lion
|
| |\ \ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Missing QLatin1String() wrapper to ensure codec of text.
Reviewed-by: Jiang Jiang
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Loading app fonts will clear the application font cache, but
QFontPrivate::engineWithScript will try to load the font again,
in Mac the font engine used here must be the one used for shaping,
because subsequent sub font engines may be added to it during the
shaping process (QCoreTextFontEngineMulti::stringToCMap). That is
why we need to fetch the font engine directly from QTextEngine's
fontEngine cache instead of QFontCache.
Task-number: QTBUG-20250
Reviewed-by: Eskil
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Since Lion, Core Text starts to return fractional values for
x origin in the glyph bounding box. To get correct alignment
we need to make it integer, it seems that round will cut certain
pixels (x = 0.6 will be round to 1, then that glyph will be moved
too much to the left in image glyph cache). Reverting 4297b85a
appears to work fine on previous version of Mac OS X as well.
This change will not affect Windows (DirectWrite) and FreeType
font engines since they both return integer values for that.
Reviewed-by: Eskil
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QBezier::pointAt() could potentially return values outside the bezier's
bounds, even when the bezier was a straight horizontal line. For
example, with y = 0.5, it would produce y=0.5 or y=0.49999999999999 for
different values of t, which when rounded cause jittering in a QML
PathView.
Task-number: QTBUG-17007
Task-number: QTBUG-18133
Reviewed-by: Kim
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Jens Bache-Wiig
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Due to subpixel grid change, these changes are no longer needed.
Reviewed-by: Eskil
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In Lion, the x position returned by CTFontGetBoundingRectsForGlyphs
can be fractional, we need to round().truncate() it as we did in
QTextureGlyphCache to save the baseLineX.
Reviewed-by: Eskil
|
| | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
dist/changes-4.8.0
|
|\ \ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix license header in qs60keycapture_p.h and qs60keycapture.cpp
Fixing WINSCW compile error
whitespace fixes
Enable key capture and RemCon interfaces for Qt apps on Symbian
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Commit bad513727833e207f7f8ca0d7c07c44c1addfb57 has old license
header in qs60keycature_p.h and qs60keycapture.cpp. New header is
used.
Reviewed-by: Trust Me
|
| |\ \ \ \ \ \ \ |
|
| |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
The volume and other multimedia keys in Symbian are not delivered
through the normal key events, but through a seperate API called
CRemConCoreApiTarget. The commit implements the feature that multimedia
key events are delivered via normal key events to Qt Application, if
the Qt::AA_CaptureMultimediaKeys is defined.
Task-number: QTBUG-4415
Reviewed-by: Sami Merila
Reviewed-by: Miikka Heikkinen
|
|\ \ \ \ \ \ \ \ \ \ |
|
| |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Flicking behaviour of ListView/GridView SnapOnItem is inconsistent
Skip flick velocity test on Mac.
Try again to fix flickable velocity on Mac.
Try to fix Mac CI test failure
Flickable is too sensitive.
Reduce timing dependancy in flickable test
Velocities reported by Flickable in onFlickStarted can be 0
Fix memory leak in QHostInfo
Regression: Some QMenus are shown completely transparent in Symbian
|
| | |\ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|/ / /
| | | |/| | | | | | | | |
|
| | | |\ \ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|/ /
| | | | |/| | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Regression: Some QMenus are shown completely transparent in Symbian
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Fix for menu transparency (QTBUG-16857) unveiled an issue in the
QS60Style when drawing QMenu background.
Style skips drawing of the menu background, since placeHolder
texture for QPalette::Window is not replaced with real background
for menus. Therefore, we need to check if the widget's palette
is still untouched when deciding whether or not to draw the
menu background.
Task-number: QTBUG-20255
Reviewed-by: Tomi Vihria
|
|\ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / |
|
| |\ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/ / / /
| |/| | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
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.
|
| | |\ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / /
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Conflicts:
doc/src/external-resources.qdoc
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
(cherry picked from commit 358e018dbb4b4dbdbfc702a6d462f113a1357e1e)
|
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
Task-number: QTBUG-19919
(cherry picked from commit 26c29a2dd7efa4c66063d1255e1f694462cbae85)
|
| | | | | | | | | | | | |
|
| |\ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / /
| | |/| | | | | | / / /
| | |_|_|_|_|_|_|/ / /
| |/| | | | | | | | | |
Conflicts:
dist/changes-4.8.0
|
| | |\ \ \ \ \ \ \ \ \
| | | | |/ / / / / / /
| | | |/| | | | | | | |
|
| | | |\ \ \ \ \ \ \ \
| | | | | |_|_|_|_|_|/
| | | | |/| | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
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
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
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
|
| | | |\ \ \ \ \ \ \ \
| | | | | |_|/ / / / /
| | | | |/| | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
On symbian QMessageBox does not look like native dialog
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
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
|
| | | | | | | | | | | |
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
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
|
| | | | | | | | | | | |
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
Makes the code clearer and more explicit.
Reviewed-by: Eskil
|
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | |
| | | | | | | | | | | |
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
|