| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
(cherry picked from commit 7e8073b37a8a3e58d82b71934f085ec8143935eb)
|
|
|
|
| |
(cherry picked from commit a02eba0de0fcf9a17d489ee1f92977c95d3afd76)
|
|
|
|
|
|
| |
linked anywhere.
(cherry picked from commit 08854de08165027acd3973876f1fffd6a1ed120f)
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit 5ca6264933af60b3cd376b7f08bea008fa69b515)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit 52cf47565e402dc682038ccaf8d725401802b603)
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 05eacd9ad40f8adb5aaa12a8b90113a73b43f642.
Conflicts:
src/gui/inputmethod/qcoefepinputcontext_p.h
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
(cherry picked from commit c5901037f0d3ccd45b0c79b38ef5b04552dad0aa)
|
|
|
|
|
| |
QTBUG-13345
(cherry picked from commit b6d47ea4872e188d8da6886cb1922f1a89245825)
|
|
|
|
|
|
| |
Task-number: QTBUG-13331
Reviewed-by: Samuel
(cherry picked from commit dcb98430f6add24c9d54253bd35d35010cc75c23)
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit 25622198904580c6eb93996f74c2e7b62afa77c7)
|
|
|
|
|
|
| |
Task-number: QTBUG-13204
Reviewed-by: axis
(cherry picked from commit 55b067d14d8c12bd29b03c17e0281a11a49f95ca)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the S60 screen furniture has already been constructed before
QWidgetPrivate::show_sys() is called on a top-level widget which
has Qt::WindowMaximized set (e.g. due to a showMaximized() call),
its geometry is set to the full screen extent, including the regions
covered by the status bar and CBA.
This patch ensures that calculation of the widget geometry always
takes into account the screen furniture.
Task-number: QTBUG-12605
Reviewed-by: Jason Barron
(cherry picked from commit a957ed92a61d9311ed163dba15f2b6f8d30bf03c)
|
|
|
|
|
|
| |
Task-number: QTBUG-10269
Reviewed-by: Jason Barron
(cherry picked from commit 859cca02a89ecadbb5578bb113e535374bcfcaca)
|
|
|
|
|
|
| |
Task-number: QTBUG-13204
Reviewed-by: axis
(cherry picked from commit 9d88ff485e93e9701719263ce0a46cb86b0398ca)
|
|
|
|
| |
(cherry picked from commit 661e237be622a5f7886cee7c06f9daa73d4a07d7)
|
|
|
|
|
|
|
|
| |
If declarative is configured out then QtDemo will now still build, with
all declarative demos disabled.
Task-number: QTBUG-12983
(cherry picked from commit 015b726aa46e774155bc13359dcd68d15df73bbd)
|
|
|
|
| |
(cherry picked from commit 5e0371250d050f619d3c7c635377213ece733e66)
|
|
|
|
|
| |
Reviewed-by: Janne Koskinen
(cherry picked from commit 74a7c2e6d179e809c93422c8aa590c922be6b6e8)
|
|
|
|
|
|
| |
Task-number: QTBUG-12817
Reviewed-by: Jason Barron
(cherry picked from commit ea85300f6456ef1bd9702296f3068edf0795736e)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously, the following sequence:
1. Widget is hidden
2. Widget partially revealed
3. Widget fully revealed
resulted in the reference count of the backing store owned by the
widget's window() being incremented twice.
This patch replaces the simple reference count with a QSet which
stores pointers to the native widgets which are descendents of
the backing store owner, and which are currently visible. The
sequence above therefore results in just a single insertion at
step (2), with step (3) having no effect on the backing store.
The QRefCountedWidgetBackingStore class has been renamed
QWidgetBackingStoreTracker to better reflect its purpose.
Task-number: QTBUG-12800
Task-number: QTBUG-12817
Reviewed-by: Jason Barron
(cherry picked from commit cb8d2dcc70846ccd9384a8b94b2a80821c0eb285)
|
|
|
|
|
| |
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 5d32b723332acab5fdf880aa0d555ab8e05d79dd)
|
|
|
|
|
|
|
|
|
|
| |
Reviewer: David Boddie
Task number: QTBUG-11938
(cherry picked from commit eea84818e98af917d3cf2bf04ea17a416ef9d55e)
Conflicts:
src/script/api/qscriptcontext.cpp
|
|
|
|
|
|
|
|
|
| |
in between graphics system change. This patch ensures that all
old surfaces are destroyed before new graphics system is
activated.
Reviewed-by: Jason Barron
(cherry picked from commit d3ab1fccea2b1e011e7518269a29045a53f0a30b)
|
|
|
|
|
|
|
|
| |
raster paint engine for translucent windows.
Task-number: QTBUG-12710
Reviewed-by: Jason Barron
(cherry picked from commit 0210bbbd7bf8254be5f7f19f524068cd39fc34c2)
|
|
|
|
|
|
|
|
|
|
|
| |
Set the purpose of the window (dialog/popup/child window etc...).
Notify WServ when modal window is shown/hidden
Notify WServ when temporary surface deallocation happens.
Notify WServ when the application is going to shutdown.
Task-number: QT-2027
Reviewed-by: Jason Barron
(cherry picked from commit 339270016bd8805b081f0b4ff550906a6bcfec5b)
|
|
|
|
|
|
|
|
|
|
| |
It has been decided that this logic will not be used by anyone at the
moment so let's remove it. This removes an exported (although private)
virtual function so breaks binary compatiblity for plugins built with
previous versions.
Reviewed-by: Jani Hautakangas
(cherry picked from commit bd1aeaa50c60cffa3e195f3f6aed808f23a5c73c)
|
|
|
|
|
|
|
| |
One step further towards no static data...
RevBy: Trust me
(cherry picked from commit ddbffbe7271cfdd3935c188ccb8e804ad73627f6)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In S60, there are two pieces of screen furniture, changes in whose
visibility or size can affect the size of the Qt application window.
These are the status pane, at the top of the screen, and the CBA at
the bottom.
QSymbianControl listens for changes in status pane visibility and
size by implementing MEikStatusPaneObserver. Notifications
received via this interface trigger a call to
QSymbianControl::handleClientAreaChange() which resizes the control.
There is no corresponding interface through which to receive
notifications of changes in CBA visibility.
This patch introduces a utility function for setting the visibility
of both the status pane and CBA, which ensures that the control's
rectangle is updated when either one changes.
Task-number: QTBUG-5320
Reviewed-by: Jason Barron
(cherry picked from commit 92d6d1c974206bac7520101ad26ca93eb0b4d977)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The qt_cleanup() function will call CCoeEnv::DestroyEnvironment() on
application shutdown. This destruction will in turn tear down the
various server sessions associated with the application. One of these
sessions is the FBSERV session and if the QPixmapCache attempts to
delete a CFbsBitmap after the session has been destroyed, the app will
crash.
The solution is call QPixmapCache::cleanup() before we destroy the
environment. This is inline with what the other platforms do.
Reviewed-by: Jason Barron
(cherry picked from commit 55625badfab6bfe49c60ab5cd9a586c6bd511579)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After the following sequence:
* Create a TLW, parent1
* Create a child of parent1, and make it a native widget
* Create another TLW, parent2
* Show parent1 and parent2
* Reparent child so its parent is now parent2
* Hide parent1
parent1's backing store should be deleted, when running on Symbian.
Task-number: QTBUG-12817
Reviewed-by: Jason Barron
(cherry picked from commit b5360eb223d5377beb62008fcc1da48f432dc8dd)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The lifetime of the backing store depends, on Symbian, on the visibility
of the native windows which are rendering from it. Specifically, once
all such windows (i.e. the TLW window and those of any native widget
descendents) have become invisible, the backing store is deleted.
During re-parenting of a visible native child widget from parent1 to
parent2, the following events occur:
1. QWidget::hide() is called on the child
2. The child widget's native control is deleted
3. A new native control is created, with its parent set as
parent2->window()->effectiveWinId()
Because there is no yield to the event loop between (1) and (2), the
application does not receive a 'window hidden' notification as a
result of the call to hide(). This means that the child widget is
not removed from the list of visible widgets held in the backing store
of parent1->window().
This patch ensures that the child is removed from this list during
between steps (1) and (2).
Task-number: QTBUG-12406
Task-number: QTBUG-12817
Reviewed-by: Jason Barron
(cherry picked from commit bc1c472967c78579178cf7e98ab999842fee3102)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
After the following sequence:
* widget starts hidden
* Partially reveal widget
* Fully reveal widget
* Hide widget
widget's backing store should be deleted, when running on Symbian.
Task-number: QTBUG-12800
Reviewed-by: Jason Barron
(cherry picked from commit cc1b6475a99994908cbd6309a08fd08614f18221)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Twitter is blocking access to the old authentification method that
our demo was using. This breaks the demo completely. To fix this, I
changed the demo into only make use of the public search API. You
can no longer tweet but you can search for different tweets.
At the moment making an oauth capable demo is not desirable due to
the problems with handling a secret app token among other issues.
Task-number: QTBUG-13181
Reviewed-by: Alan Alpert
(cherry picked from commit 9d92e1556b18db068891c0f33ff35c8f05059b73)
|
|
|
|
|
|
| |
Task-number: QTBUG-13048
Reviewed-by: Martin Jones
(cherry picked from commit 2af41f34eca0effced19b59d4c3327e3e4b627cb)
|
|
|
|
|
|
| |
Task-number: QTBUG-8927
Reviewed-by: Alan Alpert
(cherry picked from commit e8141d3eff43e419f566449f42f9548ce54acf70)
|
|
|
|
|
|
|
|
|
| |
The class has been there since 4.6 (http://labs.trolltech.com/blogs/2009/11/23/qtscript-in-46/),
but we don't see a reason to hide it any longer.
Task-number: QTBUG-13229
Reviewed-by: Olivier Goffart
(cherry picked from commit 94791e6d5be6859d87862d40233aece16d54932a)
|
|
|
|
|
|
|
|
|
|
| |
The order of global static destruction is not well defined. Ensure that
the QNetworkConfigurationManager global static is destroyed from the
QCoreApplication destructor before its dependencies are destroyed with
the rest of the global statics.
Task-number: QTBUG-13304
(cherry picked from commit 744ff7738333c35e7d621c61d72422cf3a8e7fe4)
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit d0f1f569e27f7f34f3bfc03bd759f28f7b567997)
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit bdcfcc607c1a6744cf1b35eca0914fa96e70071c)
|
|
|
|
| |
(cherry picked from commit 3db2df0a33952223ef0e1a087329ada7f2b2d3ea)
|
|
|
|
|
|
|
|
|
|
|
|
| |
The OpenVG paint engine, like the OpenGL2 paint engine, supports
caching the untransformed glyphs and transforming them as they are
drawn. Since we would pretransform the positions of the glyphs, the
transformation would be applied twice, thus making the glyphs appear
in the wrong location when the painter had a transform set.
Task-number: QTBUG-13049
Reviewed-by: Gunnar
(cherry picked from commit f3771c5d91995b2beaa73bd3e3c783b76a887b50)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The original code path of QStaticText does not include decoration
drawing, this patch generalized the drawTextItemDecoration()
function to draw decoration for drawText(), then use that to draw
decoration for QStaticText. A helper function called
drawDecorationForGlyphs() is made to allow easier extension for
direct glyphs drawing support.
Task-number: QTBUG-12121
Reviewed-by: Eskil
(cherry picked from commit a1641e27d2e2f5e29362e3737be6b9d75714d138)
|
|
|
|
|
| |
Task-number: QTBUG-13042
(cherry picked from commit 1f515224d52c9a33b46bbf926e82d5c2df1a84e4)
|
|
|
|
|
|
|
|
|
|
|
| |
Reviewed-by: Trust Me
To-be-verified-by: Qt Doc Team
(cherry picked from commit f33359fb0c56fe88e0ae3c564b7847f90889eac2)
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/external-resources.qdoc
|
|
|
|
|
|
|
|
|
|
| |
Details: It is not necessary to use entities. In any case, I replaced
them with words for consistency.
(cherry picked from commit 58d0e46dcc50a3cddabc177c9dfdfec5c66e932d)
Conflicts:
doc/src/getting-started/examples.qdoc
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Calling QIconModeViewBase::initDynamicLayout() on the second and
successive segments would return QPoint(-1,-1), resulting in a
totally empty area rectangle for all the items while in
QIconModeViewBase::doDynamicLayout(). This rectangle is used to
initialize the BSP tree, and produces an arithmetic exception when
empty.
Furthermore, a rendering bug was also apparent when displaying the
first item of a segment while the last item of the previous segment
was hidden.
Auto-tests included.
Reviewed-by: Olivier
Task-number: QTBUG-12308
(cherry picked from commit 3c7e7992461b1fef37ada68244f1b5b891015bda)
Conflicts:
src/gui/itemviews/qlistview.cpp
tests/auto/qlistview/tst_qlistview.cpp
|
|
|
|
| |
(cherry picked from commit a6937c7d8d2253c0f230254eaa2b9c8042972b30)
|
|
|
|
| |
(cherry picked from commit 2faafdeda4c715a91297b56251773b21a0cac86b)
|
|
|
|
|
|
|
|
| |
(cherry picked from commit 583d68c72ae58c1b35c2ffba733b7e68a32dc2f9)
Conflicts:
doc/src/getting-started/gettingstarted.qdoc
|
|
|
|
|
|
|
|
|
|
| |
Since 37fc9b6c3e10bb708d6c294ac37693b6df1d5351 we're already writing the
QT_NAMESPACE variable to qconfig.pri. Feature file qt.prf adds the
QT_NAMESPACE=MyNamespace define for us.
Task-number: QTBUG-5221
Reviewed-by: ossi
(cherry picked from commit 83795c1348f879d6742b4ef20b2315e0055e45a6)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Symbian's CFont::FontMaxAscent() returns in some cases an
incorrect value of 0. That usually happens (for some font sizes)
if a stroke based font is the main system font.
We were able to reproduce it on some S60 3.2 devices with a
chinese language pack installed.
This patch will test if CFont::FontMaxAscent() returns 0. And if
so, it alculates an ascent taht makes more sense.
Task-number: QTBUG-8013
Reviewed-by: Liang Qi
(cherry picked from commit f4f10d2a2d60790939492694abf6b9578a5f048a)
|