| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
QS60Style ignores Style_On state for QToolButton drawing.
This has been fixed, so that when toolbutton is "on", button is drawn
with pressed down graphics.
Task-number: QTBUG-13099
Reviewed-by: Alessandro Portale
|
|\ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-8336
Reviewed-by: Miikka Heikkinen
|
|/
|
|
|
|
|
|
|
| |
Currently style leaks an animation object (QS60StyleAnimation) when
style is destroyed. To avoid this, animation object array is
deleted in the style's destructor.
Task-number: QTBUG-13145
Reviewed-by: mread
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Symbian: return better default font for SansSerif style hint
Removing a left over #if 1..#endif construct
Fixed a few warnings.
Fixed a bug where passwords would not be committed when confirming.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The latest QtWebkit will use QFont::defaultFamily() with style
hints to ask for the appropriate default fonts on a system.
This patch makes sure thath "Nokia Sans S60" and "Series 60 Sans"
are prioritized for QFont::SansSerif, if they are present.
Task-Number: QTBUG-12611
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The bug happened when you were typing a password and pressing "Done"
softkey very quickly. Because of the temporarily visible character,
the widget would not contain the full string at the time of softkey
triggering, only the *** part.
Fixed by having the input context listen for softkey (command) events
and commit the temporary character before the softkey action is
triggered.
AutoTest: Included
Task: QTBUG-12949
RevBy: Miikka Heikkinen
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix broken S60 build
Keep mirrored char handling consistent between some font engines
Fix symbol font detection in generic CMap decoding
Minor performance improvement to QGraphicsItem::update.
|
| |
| |
| |
| | |
Reviewed-by: Liang Qi
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Keep mirrored char handling consistent between some font engines
Fix symbol font detection in generic CMap decoding
Minor performance improvement to QGraphicsItem::update.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Mirrored character subsitution should be used in right-to-left text
direction unless the font is a symbol font. This patch will keep
this behavior consistent between FreeType, QPF and S60 font engines.
For Mac font engines, the shaping process is delegated to Core Text
or ATSUI, so we don't do mirrored char handling by ourselves.
Task-number: QTBUG-3852
Reviewed-by: Lars Knoll
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
For fonts that have an AppleRoman name table, *isSymbolFont failed to
return correct value even if they have a symbol table. This patch
corrected this behavior by using symbolTable variable to detect that
instead of checking if score == Symbol.
Also prefer symbol table over AppleRoman table to make generic CMap
decoding consistent with QFontEngineFT (which will use the symbol table
whenever its available).
Task-number: QTBUG-3852
Reviewed-by: Lars Knoll
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Reported by other teams in Nokia. Avoid calling discardUpdateRequest() twice,
first in update() and then in markDirty(). No-brainer.
Task-number: QTBUG-10817
Reviewed-by: Trustme
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13204
Reviewed-by: axis
|
|/ /
| |
| |
| |
| | |
Task-number: QTBUG-13204
Reviewed-by: axis
|
|\ \
| |/
|/|
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Revert "QLineEdit cursor is shown when asked to be non-visible"
Fixed Symbian builds after introduction of boilerplate code.
|
| |
| |
| |
| | |
This reverts commit 9ef61d3d1e53d32dc2568cbfb9f8ff5b19cb4ffc.
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Build fix on Solaris for an autotest
Fix compiling issue for FreeType version earlier than 2.1.10
Fix a crash when passing a null pixmap to QPainter::drawPixmapFragments().
Use NEON and preloading for 16 bit small / medium sized image blits.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix compiling issue for FreeType version earlier than 2.1.10
Fix a crash when passing a null pixmap to QPainter::drawPixmapFragments().
Use NEON and preloading for 16 bit small / medium sized image blits.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
FT_GlyphSlot_Embolden was introduced since FreeType 2.1.10 and we
started using it since 4.7. Some systems (including RHEL/CentOS 4) only
provide earlier versions will get a compiling error if they use
-system-freetype to build Qt. This patch fix it by providing a graceful
degradation when the function is not available.
Task-number: QTBUG-13274
Reviewed-by: Eskil
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-13331
Reviewed-by: Samuel
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This gives a nice speedup for blitting of small and medium sized
images by using preloading and avoiding function call overhead to
memcpy for each scanline. For larger image widths memcpy becomes more
efficient.
Speedups of up to 40 % for 64 pixel wide images were measured.
For image widths between 2 and 16 the speedup ranges between 12 %
and 28 %.
Task-number: QT-3401
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fixed input context trying to squeeze content into a full widget.
Fixed a case where a newly created native widget would lose focus.
Cleaned up position tracking in the Symbian input methods.
Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"
Added catching of errors in timers.
QT_PLUGINS_BASE_DIR needs to be defined after load(qt_config)
QS60Style: Itemviews are drawn incorrectly
Fixed sporadically failing autotest on Symbian.
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Problem was reproduced on N97. If the FEP detects that the widget is
full while still editing text, it will try to send those events as
key events instead. Since this screws up the content in the widget,
we stop those events from reaching the widget in the input context.
AutoTest: Passed
Task: QTBUG-12949
RevBy: Miikka Heikkinen
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If a native control was created for a child widget, it would receive
the FocusChanged signal in its QSymbianControl with a value of not-
focused. This would lead the code to deactivate the whole toplevel
window. This was fixed by having Qt traverse the widget chain up to
the toplevel and check if parent widgets are also not focused.
AutoTest: Included and passed
RevBy: Denis Dzyubenko
RevBy: mread
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This fixed a case where using password mode would lead to Qt
believing that the cursor was one step to the left of where it really
was. This would have the effect of replacing the last character
instead of appending to it, and even crashing if the cursor was all
the way to the left.
The code is also much cleaner this way, but it meant that QTBUG-9867
had to be solved differently this time. We do this by assuming that
and empty FEP update means "erase last character", which seems to
work well in practice.
Also added a long overdue autotest for the FEP input methods. Most
tests pass, but some don't, which I will try to fix later.
Task: QTBUG-9867
Task: QTBUG-12949
RevBy: Miikka Heikkinen
AutoTest: Included
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 05eacd9ad40f8adb5aaa12a8b90113a73b43f642.
Conflicts:
src/gui/inputmethod/qcoefepinputcontext_p.h
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
|
| |\ \ \
| | | |/
| | |/| |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When running QS60Style on hardware, all the itemview items without
any special background (i.e. not "pressed", not "highlighted", not
"alternate") are drawn with "pressed button" graphics.
This is due that the internal drawing function gets called without
any enum value set and it seem to pick the second enumeration constant
from theme element list. The enumeration constant is not defined
to match to any integer value.
As a solution, style will not call the drawing function when theme
element is not defined.
Task-number: QTBUG-11601
Reviewed-by: Liang Qi
|
| |/ /
|/| |
| | |
| | |
| | |
| | | |
These were simply left out as an oversight.
Task-number: QTBUG-13318
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update to the NTLM code.
QTextEngine::LayoutData::reallocate musn't corrupt memory
Updated Twitter demo in response to the new Twitter oauth requirement
doc: Remove \internal tag from QScriptProgram
Doc: Reviewed updates to the model/view tutorial.
QNetworkAccessManager doc: add since tag for added enum
fixed compilation problem
added missing files
added missing files
problem: 2 images that were in raw html tables appeared smaller in konqueror for some reason - solution: fixed width for right columns in 2 raw html tables
moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
... on re-allocation failure. So, let's actually check the returned
pointer and fail, instead of using Q_CHECK_PTR.
Task-number: QT-3785
Reviewed-by: Peter Hartmann
Reviewed-by: Samuel Rødal
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Qt does not build on PowerPC when compiling for both x86 and PPC on Mac.
The compiler is invoked only once for both architecture so the defines
are there in order to get the optimized path for x86. Those defines
needs to be removed from the compilation environment when the target
is set to PPC by GCC.
Reviewed-by: Kent Hansen
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QStaticText with OpenGL1 engine
tst_qimage: backport fix of commit 0d7e683 into 4.7
qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix QStaticText with OpenGL1 engine
tst_qimage: backport fix of commit 0d7e683 into 4.7
qdrawhelper: backport the optimisations in fetchTransformBilinear from master to 4.7
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Like OpenGL2 and OpenVG, the OpenGL1 paint engine also transforms text
coordinates itself and does not require QStaticText to use device
coordinates.
Task-number: QTBUG-13228
Reviewed-by: Samuel
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master to 4.7
This backport the following commits:
e55b6a3 qdrawhelper: remove code duplication
0d7e683 qdrawhelper: optimize fetchTransformedBilinear
29ef46e Fix compilation with RVCT
6601458 qdrawhelper: Use SSE2 in fetchTransformedBilinear (when scalling up)
398ef0ca Fix nasty copy-paste bug in fetchTransformedBilinear()
d585ece qdrawhelper: fix assert in fetchTransformedBilinear
Reviewed-by: Benjamin Poulain
|
|\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix #pragma message(), the message must be enclosed in parentheses
preserve non-standard source references
QSslConfiguration: fix crash when accessing null pointer
properly parse ts contexts in obsolete messages
move the MAGIC_OBSOLETE_REFERENCE hack to the xlf file handler
Fix static build on Windows with MinGW.
Reenable the reporting of CPU features.
make qdoc3 boot-strappable again
fix MinGW cross compilation with -debug-and-release
Updated and new Slovenian translations for Qt 4.7
Designer: Fix crash on unsupported Language/Country combination.
Doc: Fixed qdoc warnings and generalized the date and time descriptions.
Doc: Whitespace fixes.
Doc: Fixed snippets in QML introduction broken in an earlier commit.
doc: Fixed numerous qdoc warnings.
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
|\ \ \ \ \
| |_|/ / /
|/| | / /
| | |/ /
| |/| |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Text is inputted on top of existing text in anomaly
QLineEdit cursor is shown when asked to be non-visible
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If QLineEdit is sent a QInputMethodEvent::Cursor event with value zero,
widget still shows blinking cursor. This is due to that QLineControl
ignores its internal state variable m_hideCursor value.
As a fix, m_hideCursor is now considered when drawing the cursor.
Additionally, the cursor blinking timer is stopped when cursor is
hidden.
Task-number: QT-3670
Reviewed-by: axis
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Commit 07880542ecc479807c23c5646d263135240822ff introduced regression to
QFontMetrics::boundingRect and QTextEngine::boundingBox on FT, XLFD and
QPF font engine. Because on these platforms, rightBearing of the last
glyphs is already removed from the width returned in glyph_metrics_t.
Subtracting that rightBearing twice will cause the resulting boundingBox
smaller than expected.
This patch fix this by removing last right bearing accounting code from
generic QTextEngine::boundingBox, instead, we put it into font engines
that need them: QFontEngineWin, QCoreTextFontEngine, QFontEngineMac,
QFontEngineS60 and QFontEngineQWS. So that the resulting width should be
correct on all platforms without introducing any performance penalties.
Task-number: QTBUG-6854, QTBUG-12950
Reviewed-by: Eskil
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In QWidget and QGraphicsWidget, propagating fonts blank out the resolve
mask, mainly to help in determining inheritance. This means that when
the font is set on a QPainter with device and therefore resolved against
the device font, none of the attributes in the font will take presedence
and the font will essentially just be ignored. For QWidgets this has not
been a problem due to the fact that the painter is opened on the widget,
getting the propagated font as its device font. For QGraphicsWidget,
however, the QPainter is opened on the viewport and the viewport's font
will therefore override the propagated font when it's passed into
setFont(). To fix this, we need the font returned by
QGraphicsWidget::font() to contain the resolve mask of the inherited
parts of its font as well. This is done last minute to avoid messing
up the rules of inheritance in the QGraphicsWidget tree (problem arises
e.g. in hierarchy A -> B -> C and a font is set on B which should override
the font C has previously inherited from A.)
Task-number: QTBUG-13188
Reviewed-by: Lars
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
There are explicit tests in qdatastream for this. IMO it's wrong,
wrong, wrong, but it's currently abused in the SVG module so we can't
change it.
Reviewed-by: Gunnar
|