8 years agoAdd environment variable switch for graphicssystem so a default can be set patches/0290-graphicssystem-environment-var
Andreas Hartmetz [Thu, 18 Mar 2010 02:28:06 +0000 (03:28 +0100)]
Add environment variable switch for graphicssystem so a default can be set
at runtime without passing a command-line parameter.

8 years agoRevert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit... v4.6.2
Simon Hausmann [Thu, 11 Feb 2010 13:51:47 +0000 (14:51 +0100)]
Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build QtWebKit with THUMB again

This restores the library size and memory consumption.

Reviewed-by: Janne Koskinen
Reviewed-by: Iain
(cherry picked from commit 86d724590212825ba6db87da75117911880a30a8)

8 years agoFixed the perl download link and description in docs
Miikka Heikkinen [Thu, 11 Feb 2010 14:37:24 +0000 (16:37 +0200)]
Fixed the perl download link and description in docs

Old link was defunct as the version it pointed is no longer available.

Task-number: QTBUG-8134
Reviewed-by: TrustMe
(cherry picked from commit 898a85964830ac17e44675b75c6584866bcf767a)

8 years agoLicense update as requested by legal for file relicensed from S60.
Janne Anttila [Wed, 10 Feb 2010 12:08:17 +0000 (14:08 +0200)]
License update as requested by legal for file relicensed from S60.

Rev-By: TrustMe
(cherry picked from commit 709a3a4b96f4cc483e63958494adbc5efdf6c57d)

8 years agoFix commercial license headers one last time.
Jason McDonald [Wed, 10 Feb 2010 13:05:23 +0000 (23:05 +1000)]
Fix commercial license headers one last time.

Reviewed-by: Trust Me
8 years agoPrevented assert when using drop shadow effect in the GL 2 engine.
Samuel Rødal [Wed, 10 Feb 2010 12:11:01 +0000 (13:11 +0100)]
Prevented assert when using drop shadow effect in the GL 2 engine.

The GL 2 pixmap filter uses Indexed8 images in the drop shadow case.

Reviewed-by: Tom Cooksey
(cherry picked from commit f04f014835e9fd4c41e9113e8036ba71ff884ae9)

8 years agoFixed compilation of the GL2 engine for OpenGL ES 2.
Kim Motoyoshi Kalland [Tue, 2 Feb 2010 12:20:10 +0000 (13:20 +0100)]
Fixed compilation of the GL2 engine for OpenGL ES 2.

glColor4f is not defined in OpenGL ES 2.

Reviewed-by: Trond
(cherry picked from commit 88c4000c21be7af37bc490a2edd9d1f481b3a862)

8 years agoFixes missing update when setting opacity on an item that had opacity 0.0
Leonardo Sobral Cunha [Thu, 28 Jan 2010 14:43:12 +0000 (15:43 +0100)]
Fixes missing update when setting opacity on an item that had opacity 0.0

We need to set the paintedViewBoundingRectsNeedRepaint flag when an item
becomes visible again because when the item has opacity 0.0 the
paintedViewBoundingRects struct can get set as outside of viewport, so the
next time the item is set to visible again we need to diregard this cached
data (otherwise the item will not be updated).

Task-number: QTBUG-7714
Reviewed-by: bnilsen
(cherry picked from commit 37f1aec1a4e71a7102e8cd2e2908c8d3be7e29f5)

8 years agoAdds convenience functions QGraphicsItemPrivate::isOpacityNull
Leonardo Sobral Cunha [Thu, 28 Jan 2010 17:09:39 +0000 (18:09 +0100)]
Adds convenience functions QGraphicsItemPrivate::isOpacityNull

This should unify the error constant used along the code and enforce qreal
to avoid unnecessary double conversions.

Reviewed-by: bnilsen
(cherry picked from commit 519760c4256997f26c039cb4b047c6207470b54f)

8 years agoAdd the download URI for smart installer package to documentation
Shane Kearns [Tue, 9 Feb 2010 19:04:09 +0000 (20:04 +0100)]
Add the download URI for smart installer package to documentation

Task-number: QTBUG-8068
Reviewed-by: David Boddie
(cherry picked from commit b0c972dfd208411086b53ee2c2b0594ade3e2d10)

8 years agoUpdate configure.exe again.
Jason McDonald [Tue, 9 Feb 2010 18:46:48 +0000 (04:46 +1000)]
Update configure.exe again.

Reviewed-by: Trust Me
8 years agoTidy the changes file.
Jason McDonald [Tue, 9 Feb 2010 18:36:19 +0000 (04:36 +1000)]
Tidy the changes file.

Reviewed-by: Trust Me
8 years agoRemove the installer from the Qt sources.
Jason McDonald [Tue, 9 Feb 2010 18:08:45 +0000 (04:08 +1000)]
Remove the installer from the Qt sources.

This copy of the installer doesn't work anymore.

Reviewed-By: TrustMe
(cherry picked from commit 707610b9f07ad96318e6d84f321588c060c0c294)



8 years agodoc: Updated deployment OS X requirements for 4.6
Martin Smith [Tue, 9 Feb 2010 12:13:31 +0000 (13:13 +0100)]
doc: Updated deployment OS X requirements for 4.6

Beginning with Qt 4.6, OS X 103 (Panther) is no longer supported.
(cherry picked from commit 9be25c3847bb90eb2a6cf9cd6d357e83b7ad89a2)

8 years agoAdded qwidget test case which displays a native child widget
Gareth Stockwell [Tue, 9 Feb 2010 11:37:18 +0000 (11:37 +0000)]
Added qwidget test case which displays a native child widget

As of commit bc82db, show()ing a native child widget causes a panic
on Symbian.  The panic code (WSERV-10) indicates that Activate() is
being called on an already-active graphics context.

This test case reproduces the defect.

Task-number: QTBUG-7960
(cherry picked from commit 33aa8f4a035c1ce9231b40844e6e0793205d12aa)

8 years agoFixed defect in handling of expose events for Symbian
Gareth Stockwell [Tue, 9 Feb 2010 09:41:29 +0000 (09:41 +0000)]
Fixed defect in handling of expose events for Symbian

Commit bc82db did not correctly handle native child widgets.

Consider the case when we have a top-level widget A with a native
child widget B.  When QSymbianControl::Draw() is called on the
control corresponding to B, the following occurs:
    1. The inExpose flag is set in B's QWExtra structure.
    2. The call to syncBackingStore() results in a call to
       QWidgetBackingStore::flush(), passing default parameters.
    3. Because no target widget was passed to flush(), this
       function selects the top-level widget (A) as the target for
       the flush operation, passing A as the first argument of
    4. QS60WindowSurface::flush() checks the inExpose flag from A's
       QWExtra structure, finds it to be false, and proceeds to
       call DrawNow() on A's control.

Because QSymbianControl::Draw() uses the default graphics context,
this context is shared between controls.  This means that the DrawNow()
call in step 4 causes a WSERV-10 panic (Activate() called on an
already-active) graphics context.

This patch moves the inExpose flag from B's QWExtra into A's QTLWExtra,
with the result that the call to DrawNow() in step 4 is suppressed.

Task-number: QTBUG-7960
Reviewed-by: axis
(cherry picked from commit 46df42af1a25fd06247bb96d9e0bf24bf19defe8)

8 years agoStreamlined smart installer package creation in Symbian
Miikka Heikkinen [Mon, 8 Feb 2010 16:19:19 +0000 (18:19 +0200)]
Streamlined smart installer package creation in Symbian

- Added make target for creating smart installer packages
- Application sis is automatically generated if missing when
  "make installer_sis" is invoked
- No need to specify installer pkg UID if self signing is enough
- Related docs fixed
- Fixed smartinstaller.sis name to be correct

Task-number: QTBUG-8026
Reviewed-by: axis
(cherry picked from commit b37ac454832a23c17418f5ebca8928b63fe02289)

8 years agoFlush the WSERV command buffer after deleting a surface.
Jason Barron [Thu, 4 Feb 2010 13:15:56 +0000 (14:15 +0100)]
Flush the WSERV command buffer after deleting a surface.

For graphics systems that use EGL surfaces in the backing store
destroying the surface does not guarantee that the memory is
immediately freed because this command does not cause a flush. This
implies that a manual flush is instead needed. We do this in 2 places;
the first is when the surface is destroyed due to a visibility changed.
The second case is just after the window has been destroyed. At this
point the backing store has already been deleted so the deletion of
both the surface and window can happen atomically in WSERV.

Task-number: QT-2506
Reviewed-by: Iain
(cherry picked from commit 91e236022acd79dfbc4aef9e30edb4d1aeb2685c)

8 years agoCrash when closing any top-level widget on Symbian.
Bjørn Erik Nilsen [Thu, 4 Feb 2010 10:35:27 +0000 (11:35 +0100)]
Crash when closing any top-level widget on Symbian.

The window surface must be deleted while the window is valid because on
some graphics systems a notifcation is sent to the window when the
surface is released.

This fix is also an optmization as we no longer process any backing
store requests while deleting the top-level. Previously it would
handle requests from the window itself and all its children.

Task-number: QT-2513
Reviewed-by: jbarron
(cherry picked from commit 34f1758428282a327c12b0d8040061c1f67ecc7f)

8 years agoAvoids missing opacity updates by not propagating the ignoreOpacity flag
Leonardo Sobral Cunha [Wed, 20 Jan 2010 14:11:58 +0000 (15:11 +0100)]
Avoids missing opacity updates by not propagating the ignoreOpacity flag

When doing a full update of a parent item, by setting one of these flags,
QGraphicsItem::ItemIgnoresTransformations | ItemClipsChildrenToShape |
ItemIsSelectable, the child items that were transparent would not be
shown when setting their respective opacity to 1.0

We just need to set the ignoreOpacity flag when setting opacity to 0.0.
This avoids propagating this flag to the child items when it's not

Task-number: QT-2653
Reviewed-by: bnilsen
(cherry picked from commit 08c649e6a81ab13d0c7db6aa1b480ed149e3f770)

8 years agoWhitespace/tab fixes.
Jani Hautakangas [Fri, 5 Feb 2010 10:29:08 +0000 (12:29 +0200)]
Whitespace/tab fixes.

Reviewed-by: Trust me
(cherry picked from commit fd12fbcf332878ab6a5b6ef8f09804b8598faced)

8 years agos60 application loses normalGeometry when returning from fullscreen
Samuel Nevala [Fri, 5 Feb 2010 07:51:00 +0000 (09:51 +0200)]
s60 application loses normalGeometry when returning from fullscreen

Problem description: normalGeomerty lost during showFullScreen

1. Reported problen was due on void QSymbianControl::PositionChanged()
over write top->normaGeometry on every position change. As fix
top->normalGeometry is moved to new rect:s top left only when
widget windowState == 0.

2. Also made some new qwidget auto tests. Refactored s60 side
setWindowState to be more readable. Minimized window state now
hides window decoration.

QApplication & QWidget autotest run on emulator and tested on
s60 5.0 hw using attached application.



Merge-request: 2256
Reviewed-by: Jani Hautakangas <ext-jani.hautakangas@nokia.com>
(cherry picked from commit 79fb890a4f2a13cc0f21e92f5b2a6e10af1430b4)

8 years ago Sync with 4.6 branch version fo the changes file.
Jesper Thomschutz [Tue, 9 Feb 2010 13:58:44 +0000 (14:58 +0100)]
Sync with 4.6 branch version fo the changes file.

Reviewed-by: Trust Me
8 years agoQGraphicsWidget is painted twice on the first show.
Bjørn Erik Nilsen [Wed, 3 Feb 2010 18:39:17 +0000 (19:39 +0100)]
QGraphicsWidget is painted twice on the first show.

We want to discard all update requests when we there's a full update
pending. The problem was that 'updateAll' was reset too early causing
update requests to fall through. To prevent this from happening we
reset 'updateAll' right before the items are actually painted.

Auto-test included.

Task-number: QTBUG-6956
(cherry picked from commit dda8a57c085216db609f822837c50bae38006b4e)

8 years agoCleanup after "QGraphicsWidget is painted twice on the first show"
Bjørn Erik Nilsen [Thu, 4 Feb 2010 16:44:14 +0000 (17:44 +0100)]
Cleanup after "QGraphicsWidget is painted twice on the first show"

Commit: dda8a57c085216db609f822837c50bae38006b4e
We don't want to reset 'updateAll' at that point, for the same reason as
mentioned in the above commit. More details in the task.

Task-number: QTBUG-6956
(cherry picked from commit 39bbc477e418d4d34c2f44fd10e76950a1ae781d)

8 years agoWorkaround for abld toolchain issue with s60main
Miikka Heikkinen [Mon, 8 Feb 2010 09:40:44 +0000 (11:40 +0200)]
Workaround for abld toolchain issue with s60main

When building for ARMV6 with abld toolchain in Symbian, qtmain.lib
ends up missing some symbols that are required to link it against
GCCE apps. This happens because --dllimport_runtime compiler
option is missing in ARMV6 builds of qtmain.lib.

Task-number: QTBUG-7952
Reviewed-by: axis
(cherry picked from commit 95a095c69973081b66782e83fccd54ba15ca0b71)

8 years agoDocumentation: clarified RVCT support for Symbian
Gareth Stockwell [Mon, 8 Feb 2010 17:00:25 +0000 (17:00 +0000)]
Documentation: clarified RVCT support for Symbian

Task-number: QTBUG-8012
Reviewed-by: Iain
(cherry picked from commit 245295435f40b663fc164165ec788d8872e91624)

8 years agoDon't remove all dependencies when patching the pkg.
Miikka Heikkinen [Mon, 8 Feb 2010 12:17:29 +0000 (14:17 +0200)]
Don't remove all dependencies when patching the pkg.

Only remove dependencies that are known to cause unncessary warnings
from pkg files when patching them with patch_capabilities.pl script.

Task-number: QTBUG-8018
Reviewed-by: Janne Koskinen
(cherry picked from commit 5f887ce23a38fc6b9f395593a4f7ce1de5b80e8d)

8 years agoUpdate Symbian OS def files for 4.6.2
Shane Kearns [Mon, 8 Feb 2010 13:45:31 +0000 (14:45 +0100)]
Update Symbian OS def files for 4.6.2

Task-number: QTBUG-8024
(cherry picked from commit 169279fa29f9a5afeb079729c9aec3cffbf81811)

8 years agoFix to S60 softkey pressed down image.
Janne Anttila [Fri, 5 Feb 2010 12:01:17 +0000 (14:01 +0200)]
Fix to S60 softkey pressed down image.

On Symbian the icons which are passed to softkeys, i.e. to actions with
softkey role, need to use pixmap alpha channel instead of mask. Otherwise
S60 CBA framework fails to create 50% transparent pressed down mask for
softkey icon.

Task-number: QTBUG-7314

Review-By: Sami Merila
(cherry picked from commit 95012c3ca7ef52ea8f2a2ecb67987b8575758987)

8 years agoInitial support for S60 softkey icons.
Janne Anttila [Thu, 4 Feb 2010 13:57:44 +0000 (15:57 +0200)]
Initial support for S60 softkey icons.

The logic for resolving the icon size in landscape mode for S60 5.0
(5800XM) is somewhat fragile, but better way is not yet know.

Also the 50% transparent mask what CBA implementation tries to create
for pressed down CB Abuttons fails for some reason. When button is
pressed down there are drawing artifacts in softkey images.

These issues will be tried to resolve with later commits

Task-number: QTBUG-7314

Review-By: Sami Merila
(cherry picked from commit 94abb3ee93aa09f79640e14fed89b286c57ce05c)

8 years ago[CRASH] audioinput and audiooutput examples crash when no devices are
Kurt Korbatits [Sun, 7 Feb 2010 23:50:33 +0000 (09:50 +1000)]
[CRASH] audioinput and audiooutput examples crash when no devices are

Reviewed-by:Justin McPherson
(cherry picked from commit 3108f02f35685bd57486e198277c600e09d98b13)

8 years agoI10n/German: Update translations for 4.6.2
Friedemann Kleint [Thu, 4 Feb 2010 09:08:54 +0000 (10:08 +0100)]
I10n/German: Update translations for 4.6.2
(cherry picked from commit 3e6b22f138ad5b592dedbca99f91fdf612f20cea)

8 years agoI10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverb
Friedemann Kleint [Thu, 4 Feb 2010 09:07:53 +0000 (10:07 +0100)]
I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit d950a35334dda4620a138914c8d8198da670b2dd)

8 years agouic: Fixed code generating setCentralWidget()-calls of QMainWindow.
Friedemann Kleint [Thu, 4 Feb 2010 12:58:35 +0000 (13:58 +0100)]
uic: Fixed code generating setCentralWidget()-calls of QMainWindow.

Regression introduced by QTBUG-5824 change
6809bd020e3307324e136707f32f6f17f77b9591. Do not generate
setCentralWidget() for Qt3Support toolbar/dock widget classes.

Reviewed-by: ogoffart <olivier.goffart@nokia.com>
Task-number: QTBUG-7612
(cherry picked from commit 3c991df1681471cbfb737f6bed0c679e5ca67aa9)

8 years agoFurther bug fixes for enable/disables DEF files mechanism on Symbian
Jason McDonald [Sat, 6 Feb 2010 09:12:15 +0000 (19:12 +1000)]
Further bug fixes for enable/disables DEF files mechanism on Symbian

Fix bug where all target types, including apps, plugins and static
libraries were getting DEFFILE statements - now it's just libraries that
get it.

Fix bug where duplicate DEFFILE blocks were being added to projects that
manually specified their own DEFFILE - this now tests for the qmake
variable "defBlock" being set, and doesn't add additional DEFFILE
statements if it is.
NOTE: This means that adding DEFFILE statements to MMP_RULES
manually should be done by creating a variable called defBlock, and
adding that to the MMP_RULES (ie. MMP_RULES += defBlock)

Fix bug in configure.exe, where using -nokia-developer for Windows builds
would warn about Symbian DEF file usage (or lack thereof)

Reviewed-by: Janne Koskinen
Reviewed-by: Jason Barron
(cherry picked from commit 3569038ffec0c133ff29f80d506f334cc0f2ddb3)



8 years agoFixed QGifHandler::loopCount().
Trond Kjernåsen [Fri, 5 Feb 2010 15:06:33 +0000 (16:06 +0100)]
Fixed QGifHandler::loopCount().

Task-number: QTBUG-7037
Reviewed-by: Kim
(cherry picked from commit 381f5ae82cccec3774b68674b4c0e782e9f49f6f)

8 years agoCache the sizes of the images in an animated GIF.
Trond Kjernåsen [Thu, 4 Feb 2010 10:44:44 +0000 (11:44 +0100)]
Cache the sizes of the images in an animated GIF.

Rework the previous commit a bit and include caching of image sizes.

Task-number: QTBUG-6696
Reviewed-by: Kim
(cherry picked from commit 6d1d425e219b0a5e03603f7d708cd740b7d3a3f4)

8 years agoSync with 4.6 branch version fo the changes file.
Jason McDonald [Sat, 6 Feb 2010 09:00:45 +0000 (19:00 +1000)]
Sync with 4.6 branch version fo the changes file.

Reviewed-by: Trust Me
8 years agoMy 4.6.2 changes
Thiago Macieira [Thu, 4 Feb 2010 13:48:11 +0000 (14:48 +0100)]
My 4.6.2 changes
(cherry picked from commit 38d31452b3cafd738c215b5686bf3ff95c1d27d6)

8 years agoAdded my changes to changes file.
axis [Thu, 4 Feb 2010 13:42:50 +0000 (14:42 +0100)]
Added my changes to changes file.
(cherry picked from commit 5ddcf96b8339850d1f84db9f487ac15a1ed3364a)

8 years agoMy changes for 4.6.2
João Abecasis [Thu, 4 Feb 2010 13:15:00 +0000 (14:15 +0100)]
My changes for 4.6.2
(cherry picked from commit 551575ae14de1c80712478ba07fd26c7cccec322)

8 years agoMy changelog for 4.6.2
Yoann Lopes [Thu, 4 Feb 2010 12:15:31 +0000 (13:15 +0100)]
My changelog for 4.6.2
(cherry picked from commit db82dda4ae3672844f7637394bf9a403e7c4f4b3)

8 years agoMy Changelog entries for 4.6.2
Markus Goetz [Thu, 4 Feb 2010 11:49:37 +0000 (12:49 +0100)]
My Changelog entries for 4.6.2
(cherry picked from commit b52e4ac1dfcce317872d9104142c026951a29145)

8 years agoAdd some entries to the change log
Jason McDonald [Sat, 6 Feb 2010 08:56:10 +0000 (18:56 +1000)]
Add some entries to the change log
(cherry picked from commit 88a3be84f9a1cb235a8e3a9b25df7763646166b6)



8 years agoChange log updated
Prasanth Ullattil [Thu, 4 Feb 2010 09:26:27 +0000 (10:26 +0100)]
Change log updated
(cherry picked from commit 92638ff2f459a8f7151385a192317e9ec91d9e66)

8 years agoRevert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal...
Olivier Goffart [Wed, 3 Feb 2010 10:30:20 +0000 (11:30 +0100)]
Revert "QAbstractScrollArea: Wheel over a scrollarea that has only one horizontal scrollbar"

This reverts commit 46a3e518b3070cf7cb4cbbb2cb58254454cf169d.

This shown to cause more problem than it solved

Also update the changelog

Reviewed-by: Thierry
(cherry picked from commit d53315d30b38352db11063096ee3867a40bdc234)

8 years agoUpdate changes-4.6.2.
Samuel Rødal [Wed, 3 Feb 2010 09:36:15 +0000 (10:36 +0100)]
Update changes-4.6.2.
(cherry picked from commit 7d4ef9167249df5f00831dc07e57705eb1ddd22a)

8 years ago4.6.2 changes
Jason McDonald [Sat, 6 Feb 2010 08:51:39 +0000 (18:51 +1000)]
4.6.2 changes
(cherry picked from commit 85578c6c37d9e4eb0da888937b20ba93a26d8805)



8 years agoMy changes for 4.6.2
Miikka Heikkinen [Thu, 4 Feb 2010 16:16:43 +0000 (18:16 +0200)]
My changes for 4.6.2

Reviewed-by: TrustMe
(cherry picked from commit 96a169ac3f235433906d58ac0e4c613f51c21bf3)

8 years agoRhys Weatherley's changes for 4.6.2
Rhys Weatherley [Thu, 4 Feb 2010 05:02:41 +0000 (15:02 +1000)]
Rhys Weatherley's changes for 4.6.2
(cherry picked from commit 264f4451667e7da90e63cf87a2b4a6eb72a14d3b)

8 years agoUpdated my changelog entry
Denis Dzyubenko [Wed, 3 Feb 2010 10:36:14 +0000 (11:36 +0100)]
Updated my changelog entry

Reviewed-by: trustme
(cherry picked from commit a9ffa944f8599db0559e9d07509a3778f49bbc2a)

8 years agoAdding my changes.
Carlos Manuel Duclos Vergara [Wed, 3 Feb 2010 09:14:26 +0000 (10:14 +0100)]
Adding my changes.
(cherry picked from commit d5a3866d20507967e14ed34930f08ce6248000e5)

8 years agoAdd changes for 4.6.2
Anders Bakken [Tue, 2 Feb 2010 16:06:43 +0000 (08:06 -0800)]
Add changes for 4.6.2

Mostly DirectFB.

Reviewed-by: TrustMe
(cherry picked from commit bcd979230af769b49a1e3fdb1c9e1103ce2348de)

8 years agoChangelog: Added Designer/uic3 changes for 4.6.2
Friedemann Kleint [Tue, 2 Feb 2010 15:17:53 +0000 (16:17 +0100)]
Changelog: Added Designer/uic3 changes for 4.6.2
(cherry picked from commit 0f92406252b9d288ef8ebbefc15e66d0ce01f46c)

8 years agoUpdated changlog 4.6.2
Kurt Korbatits [Tue, 2 Feb 2010 23:36:41 +0000 (09:36 +1000)]
Updated changlog 4.6.2
Added bug 7044 to log.
(cherry picked from commit 89377dc65ea505de568bb7243396ae260f435438)

8 years agoImplemented QGifHandler::imageCount().
Trond Kjernåsen [Tue, 2 Feb 2010 14:05:54 +0000 (15:05 +0100)]
Implemented QGifHandler::imageCount().

Task-number: QTBUG-7514
Reviewed-by: Kim
(cherry picked from commit 94b3918fb52858064811c4993dac6392d0043b24)

8 years agoAssert failure when setting a widget focus proxy as its successor in tab order
Gabriel de Dietrich [Mon, 1 Feb 2010 17:03:06 +0000 (18:03 +0100)]
Assert failure when setting a widget focus proxy as its successor in tab order

Now we check that and skip it from the tab list. Auto-test included.

Reviewed-by: leo
Task-number: QTBUG-7532
(cherry picked from commit 94f5f21ac88de0d940d6ac27d222f1ef8e66d939)

8 years agoFix GL texture leaks when pixmaps are deleted
Tom Cooksey [Fri, 29 Jan 2010 10:39:06 +0000 (11:39 +0100)]
Fix GL texture leaks when pixmaps are deleted

This fixes quite a lot of issues:

* QtOpenGL only registered qpixmap destruction hooks on X11 and
  those only cleanup the EGL/GLX surface, not the texture object.
* The QPixmap destruction hooks were only being called from the
  QPixmap destructor. However, this means when a QPixmap is assigned
  to another QPixmap, the hooks don't get called.

Task-number: QTBUG-7647
Reviewed-By: Samuel
Reviewed-By: Trond
(cherry picked from commit 9e95ce2a68ef167e17dccc5789cbf3bf74712280)

8 years agoQStyleSheetStyle: Fix combinaison of border-image and border-radius
Olivier Goffart [Wed, 3 Feb 2010 11:47:34 +0000 (12:47 +0100)]
QStyleSheetStyle: Fix combinaison of border-image and border-radius

Regression since b4d642e639eabde5d72a4

Task-number: QTBUG-7737
Reviewed-by: Gabriel
(cherry picked from commit cc585886ba9da17064a7fc858f5d717967da6e85)

8 years agoFixed a crash when QPixmaps are destroyed after the ~QApplication.
Trond Kjernåsen [Fri, 29 Jan 2010 15:14:00 +0000 (16:14 +0100)]
Fixed a crash when QPixmaps are destroyed after the ~QApplication.

Destroying QPixmaps after the QApp destructor will leak native pixmap
objects on X11, and it's a general rule that all GUI objects must
be destroyed before the QApp destuctor is called.

Task-number: QTBUG-7746
Reviewed-by: Kim
(cherry picked from commit 4a5e81f5320daa82352b13e670718998b0d2d23b)

8 years agoremove the rounded extra frame around the main message editor
Oswald Buddenhagen [Fri, 5 Feb 2010 13:32:10 +0000 (14:32 +0100)]
remove the rounded extra frame around the main message editor

for one, it just added visual noise.
second, it did not respect the color scheme, which made it unusable with
light-on-dark colors.

Task-number: QTBUG-7778
(cherry picked from commit b0e4af35ec8ddb5e7bfa658f916fbf29caa5a550)

8 years agoFixed missing textures in the boxes demo.
Kim Motoyoshi Kalland [Tue, 2 Feb 2010 09:18:15 +0000 (10:18 +0100)]
Fixed missing textures in the boxes demo.

The boxes demo assumed that the current GL colour was the default white,
but the GL2 paint engine set it to black. Fixed by resetting the colour
to white in resetGLState().

Task-number: QTBUG-7779
Reviewed-by: Trond
(cherry picked from commit 787824cb4add4d45a0e90fd736a54e75fa048475)

8 years agoFixed garbled 3D Qt logo in the overpainting example.
Kim Motoyoshi Kalland [Mon, 1 Feb 2010 13:30:15 +0000 (14:30 +0100)]
Fixed garbled 3D Qt logo in the overpainting example.

Disable vertex attribute arrays in the GL2 paint engine when
calling QPainter::beginNativePainting() and QPainter::end().

Task-number: QTBUG-7781
Reviewed-by: Trond
(cherry picked from commit afe0f17eb5974adbedd1bc1f2fcd98459d92df47)

8 years agoQGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible.
Bjørn Erik Nilsen [Wed, 3 Feb 2010 10:17:19 +0000 (11:17 +0100)]
QGraphicsScene: Use QPainter::setClipRect instead of setClipPath if possible.

Using QPainter::setClipPath results in complex (and slow) alphamasking
so this must be avoided if possible.

Task-number: QTBUG-7790
Reviewed-by: samuel
(cherry picked from commit 80e114ad0b7974894858a17153d6f54546835066)

8 years agoOptimize single-rect IntersectClip in OpenVG using the scissor
Rhys Weatherley [Wed, 3 Feb 2010 21:30:37 +0000 (07:30 +1000)]
Optimize single-rect IntersectClip in OpenVG using the scissor

Task-number: QTBUG-7791
Reviewed-by: Sarah Smith
(cherry picked from commit 1677382148ed9e8d037d03a6fcc7bbe40458d69a)

8 years agoAvoids a possible crash when saving the state of a main window
Thierry Bastian [Tue, 2 Feb 2010 15:39:40 +0000 (16:39 +0100)]
Avoids a possible crash when saving the state of a main window

The crash could appear when saving the state of the main window in
response to the visibilityChanged of the dock widgets.

Task-number: QTBUG-7838
Reviewed-by: ogoffart
(cherry picked from commit 3d2dbeb65089efaff4b92b7d13c13c1a234f71b0)

8 years agoUse OpenVG scissor on 90/180/270 rotations and simple clips.
Rhys Weatherley [Thu, 4 Feb 2010 00:12:14 +0000 (10:12 +1000)]
Use OpenVG scissor on 90/180/270 rotations and simple clips.

Task-number: QTBUG-7864
Reviewed-by: Sarah Smith
(cherry picked from commit 4c84020bd1c049ce82e0deb77196829616b91f4a)

8 years agoFixed casual crash in initializeDb (Symbian)
Alessandro Portale [Fri, 5 Feb 2010 20:31:10 +0000 (21:31 +0100)]
Fixed casual crash in initializeDb (Symbian)

dynamic_cast should be used carefully with rvct before version 4.

We found that out after the a dynamic (down)-cast from CFont* to
CFbsFont* in QtGui suddenly failed.

We test for (TypeUid() == KCFbsFontUid), before doing the
cast. So, a static_cast is safe in this case. Also the other
two dynamic_casts in qfontdatabase_s60.cpp were changed to


Task-number: QTBUG-7963
Reviewed-by: lars
modified:   src/gui/text/qfontdatabase_s60.cpp
(cherry picked from commit 3b7164b3188e9382510bef2211e82ef777faa75c)

8 years agoRemove unneeded resources from QtGui
Alessandro Portale [Tue, 26 Jan 2010 18:31:01 +0000 (19:31 +0100)]
Remove unneeded resources from QtGui

QtGui contains loads of resources. 337,160 bytes just for qstyle.
And since this is nearly exclusively full of PNG files,
it won't really be compressed in the qt.sis package.
And it will eat unneccessary Ram.

This patch removes about 260,000 bytes of resources. We only want
the 32-pixel big icons. No 16- and 129- pixel versions.

Task-number: QTBUG-7277
Reviewed-by: Sami Merila
modified:   src/gui/kernel/qapplication.cpp
new file:   src/gui/styles/qstyle_s60.qrc
modified:   src/gui/styles/styles.pri
(cherry picked from commit 9eea7172d4d4984a111f009a60f5eaa0568fcf89)

8 years agoDoc: Correcting image
Morten Engvoldsen [Thu, 4 Feb 2010 13:32:20 +0000 (14:32 +0100)]
Doc: Correcting image
Changing "Trolltech" to "Nokia"

Reviewed-by:Trust me
(cherry picked from commit 5160af692fd0352457cdf12cb497e1b8d8eed858)

8 years agoFixed the location where bootstrap.sis is looked for.
Miikka Heikkinen [Thu, 4 Feb 2010 16:04:43 +0000 (18:04 +0200)]
Fixed the location where bootstrap.sis is looked for.

Task-number: QTBUG-7908
Reviewed-by: TrustMe
(cherry picked from commit 07d81d0e0f15f015c7436992a99ef4b1ec36ae1c)

8 years agoAdded support for smart installer package generation in Symbian
Miikka Heikkinen [Thu, 4 Feb 2010 13:08:44 +0000 (15:08 +0200)]
Added support for smart installer package generation in Symbian

Smart installer packages bundle normal application sis with a bootstrap
package that will download a smart installer when the package
is installed. Smart installer in turn will download any dependencies
of the application that are available on remote server, such as
Open C, Qt, and QtWebkit packages, and install them

Smart installer packages are generated when DEPLOYMENT.installer_header
variable is defined in applicatoin .pro file.

This commit is still missing properly signed bootstrap.sis package.

Task-number: QTBUG-7908
Reviewed-by: Shane Kearns
(cherry picked from commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976)

8 years agoAdd the QMAKE_FILE_EXT variable to extra compilers generation.
Jocelyn Turcotte [Thu, 4 Feb 2010 10:18:47 +0000 (11:18 +0100)]
Add the QMAKE_FILE_EXT variable to extra compilers generation.

This give the possibility to get the file name with the extension and
without the path.

Reviewed-by: Joao
Reviewed-by: Marius Storm-Olsen
(cherry picked from commit 4c8b2aa00acc00a95b6f950a4ab7de737631e494)

8 years agoFixed compile of framecapture, simpleselector for symbian-abld winscw.
Rohan McGovern [Tue, 2 Feb 2010 05:25:15 +0000 (15:25 +1000)]
Fixed compile of framecapture, simpleselector for symbian-abld winscw.

`QT += network' is required to find the network headers.
(cherry picked from commit 0db6060e54d8d5862ae0b7ffa4d3c187d30fd159)

8 years agoFixed an endless loop if printing web pages.
Trond Kjernåsen [Thu, 28 Jan 2010 12:29:54 +0000 (13:29 +0100)]
Fixed an endless loop if printing web pages.

Entering a page range which is valid, but outside of the printable
range would result in an infinite loop.

Task-number: QTBUG-6051
Reviewed-by: Simon Hausmann
(cherry picked from commit 7c2000060bbc152ae32594f3d4dd60bd3351dab0)

8 years agoWebkit: Fix missing namespace.
ck [Tue, 2 Feb 2010 08:04:39 +0000 (09:04 +0100)]
Webkit: Fix missing namespace.
(cherry picked from commit 0a9edf7a672b4a30b817439ad67a0e08e3670e8f)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 69dd29...
Simon Hausmann [Tue, 2 Feb 2010 11:13:07 +0000 (12:13 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 69dd29fbeb12d076741dce70ac6bc155101ccd6f )

Changes in WebKit/qt since the last update:
(cherry picked from commit 5c8be23e6b5fa732f4c799c783a8b22a85992211)

8 years agoAdded descriptions of translatable strings for Phonon MMF reverb effect
Gareth Stockwell [Wed, 3 Feb 2010 15:52:14 +0000 (15:52 +0000)]
Added descriptions of translatable strings for Phonon MMF reverb effect

Reviewed-by: trustme
(cherry picked from commit 4b059682ddba4a1fb90c656d7d829680779a2e60)

8 years agoCorrected namespace for Phonon::MMF translatable error strings
Gareth Stockwell [Wed, 3 Feb 2010 15:39:43 +0000 (15:39 +0000)]
Corrected namespace for Phonon::MMF translatable error strings

Error strings are now part of the Phonon::MMF namespace.

Reviewed-by: trustme
(cherry picked from commit 14ee2007fd2ada46e5fe30af838f5a7fcb7c6f4d)

8 years agoDeployed QtMultimedia.dll on Symbian
Gareth Stockwell [Mon, 1 Feb 2010 14:37:57 +0000 (14:37 +0000)]
Deployed QtMultimedia.dll on Symbian

Task-number: QT-2813
Reviewed-by: trustme
(cherry picked from commit a70a97cceccced13429b88f99373650d39da2f75)

8 years agoImplementation for QVGPixmapData to/fromSymbianCFbsBitmap
Jani Hautakangas [Wed, 3 Feb 2010 08:46:53 +0000 (10:46 +0200)]
Implementation for QVGPixmapData to/fromSymbianCFbsBitmap
(cherry picked from commit 0c73b18d0750bee9da4b88de595aa6093b5be820)

8 years agoAdjust rw base address for gui built with GCCE for Symbian OS
Iain [Thu, 5 Nov 2009 12:16:41 +0000 (13:16 +0100)]
Adjust rw base address for gui built with GCCE for Symbian OS

fixed during merge to match new style flag setting.

Reviewed-by: Janne Koskinen
(cherry picked from commit afae62256897a8ed14e3156df33838082c6d4b98)

8 years agoAdd visibility-inlines-hidden for GCCE on Symbian OS
Iain [Thu, 5 Nov 2009 10:22:28 +0000 (11:22 +0100)]
Add visibility-inlines-hidden for GCCE on Symbian OS

Reviewed-by: axis
(cherry picked from commit b5298dcf3d29b253a31974762cc9227b25f94e93)

8 years agoCleared up QEvent documentation for QGraphicsSceneDragDropEvent events.
Bastian Bense [Wed, 3 Feb 2010 10:57:38 +0000 (11:57 +0100)]
Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.

Added the "(QGraphicsSceneDragDropEvent)" behind the documentation of
the QGraphicsSceneDrag*-type events. Without this hint it gives the
impression that you can't access the data being dragged within

Task-number: QTBUG-7547

Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
(cherry picked from commit 48d040b3536dbce06f54c90da489a5308bee3870)

8 years agoS60 softkey refactoring (support for merging, priorities and menus)
Janne Anttila [Wed, 3 Feb 2010 09:37:24 +0000 (11:37 +0200)]
S60 softkey refactoring (support for merging, priorities and menus)

Implemented features:

Softkey Merging:
Widget can set only one softkey and set flag that rest of the softkeys
shall be taken from parent.

Priority Handling:
If multiple sokftkeys with same role are set, the highest priority
action gets displayed.

Custom Softkey Menu:
By setting QMenu to QAction and assigning a softkey role for that
action, the native menubar will be displayed when sofkey is clicked.

Softkey Image:
Initial code for implementing sofkey image support, the final
implementation is still pending legal acceptance to use
eiksoftkeyimage.h header file which is under EPL license.

Task-number: QTBUG-7315

Review-By: Sami Merila
Review-By: Jason Barron
(cherry picked from commit 2a8d20453926082062246fc4cc788f88ea3c59ae)

8 years agoFixed potential crash in mac style
Jens Bache-Wiig [Tue, 2 Feb 2010 11:17:19 +0000 (12:17 +0100)]
Fixed potential crash in mac style
(cherry picked from commit 7ced77b654eb46af1221a55e315795c1be1753a0)

8 years agoFix missing non-unified toolbar margins on Mac
Jens Bache-Wiig [Tue, 2 Feb 2010 10:46:54 +0000 (11:46 +0100)]
Fix missing non-unified toolbar margins on Mac

The tool bar appearance have regressed in 4.6 for applications that
do not utilize the unified tool bar appearance. This fix restores the
margin and spacing to their 4.5 appearance.

Task-number: QTBUG-7831
Reviewed-by: morten
(cherry picked from commit e4835d58381cd33fe067b05bfd6301d2246e3e67)

8 years agoAdded support for ifdeffing for manufacturer in generated pkg files
Miikka Heikkinen [Thu, 28 Jan 2010 12:06:48 +0000 (14:06 +0200)]
Added support for ifdeffing for manufacturer in generated pkg files

DEPLOYMENT.manufacturers variable can be used to define manufacturer

DEPLOYMENT.manufacturers.fail_note variable can be used to define
a file that contains the text to be shown in case of failed
manufacturer check.

Task-number: QTBUG-7695
Reviewed-by: Janne Koskinen
(cherry picked from commit 08c1c9ef6f30706cd574eded656f4d65a1b18db5)

8 years agoFixed no-timeout case for QProcess::waitForFinished in Symbian
Miikka Heikkinen [Mon, 1 Feb 2010 10:51:38 +0000 (12:51 +0200)]
Fixed no-timeout case for QProcess::waitForFinished in Symbian

QProcess::waitForFinished was panicking in Symbian when timeout of -1
was supplied. Fixed it to disable timeout and block until process
exit, as docs indicate it should.

Task-number: QTBUG-7667
Reviewed-by: Janne Anttila
(cherry picked from commit e63ea3587444e122242a137a699b5a717d3d26bd)

8 years agoFixed text rendering via scaled QPainter on rasterPaintEngine / Symbian
Alessandro Portale [Mon, 1 Feb 2010 20:29:47 +0000 (21:29 +0100)]
Fixed text rendering via scaled QPainter on rasterPaintEngine / Symbian

Text rendering in Qt for Symbian looks very bad on a scaled QPainter.

Instead of simply using a Symbian font with the right size it followed
the code path that is usually used for "tricky transformation":
Use the glyph outlines and rasterize them in Qt as QPainterPath.
That's slow and especially ugly on Symbian since we do not (yet)
get the glyph outlines from Symbian.

This patch adds QFontEngineS60::setFontScale() so that QFontEngineS60
has one additional native font handle with the scaled size. The raster
paint engine will call that function in case that the painter is scaled.
Since we already have QFontEngineS60 specific code in the raster paint
engine, this patch did not have to add #ifdefs.


Task-number: QTBUG-7614
Reviewed-by: Jason Barron
modified:   gui/painting/qpaintengine_raster.cpp
modified:   gui/text/qfontengine_s60.cpp
modified:   gui/text/qfontengine_s60_p.h
(cherry picked from commit 5a64033f89e07505bb77d3c172597b8df3cbd762)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a73344...
Simon Hausmann [Tue, 2 Feb 2010 10:32:26 +0000 (11:32 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a733444d3be6605552471f047558927495ff62b7 )

Changes in WebKit/qt since the last update:

Fix up cherry-pick of backup restoration fix
(cherry picked from commit 54de7595a54e67efb60cdc9eb4c4ff15596c3763)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( afc4c2...
Simon Hausmann [Mon, 1 Feb 2010 13:52:17 +0000 (14:52 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( afc4c208fe296f5a1dd0e73f2bd1273bd22d9b24 )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2010-01-28  Kenneth Rohde Christiansen  <kenneth@webkit.org>

        Reviewed by Simon Hausmann.

        Do not set the combobox font on Maemo5 and S60; use the
        default instead.

        * WebCoreSupport/QtFallbackWebPopup.cpp:

2010-01-28  Andreas Kling  <andreas.kling@nokia.com>

        Reviewed by Kenneth Rohde Christiansen.

        [Qt] Support kinetic scrolling on Maemo 5


        Patch by Ralf Engels <ralf.engels@nokia.com> and
        Robert Griebl <rgriebl@trolltech.com>

        * Api/qwebview.cpp:

2010-01-29  Kenneth Rohde Christiansen  <kenneth@webkit.org>

        Reviewed by Simon Hausmann

        Disable auto-uppercase and predictive text on Maemo5, just like the
        build-in MicroB Browser.

        * WebCoreSupport/EditorClientQt.cpp:
(cherry picked from commit b8102ec6d2f01a0aedf2ecd5bbf16d3a5f6c296e)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ca7b2e...
Simon Hausmann [Fri, 29 Jan 2010 13:59:39 +0000 (14:59 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ca7b2e1e1ca558050cf49dd8f7c9b35e4b9d4df5 )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2010-01-28  Trond Kjernåsen <trond@trolltech.com>

        Reviewed by Simon Hausmann.

        [Qt] Fix for endless print loop when printing web pages

        * Api/qwebframe.cpp:

2010-01-26  Simon Hausmann  <simon.hausmann@nokia.com>

        Reviewed by Kenneth Rohde Christiansen.

        [Qt] Show comboboxes on Maemo 5

        Don't try to show the combobox by simulating a mouse event from QCursor::pos() to
        get the combobox position right. The position on Maemo 5 is independent from the mouse
        and there's no QCursor::pos().

        * WebCoreSupport/QtFallbackWebPopup.cpp:

2010-01-26  Holger Hans Peter Freyther  <zecke@selfish.org>

        Reviewed by Simon Hausmann.

        [Qt] JavaScript prompt is currently broken

        In r52152 a patch was landed to convert a null QString
        to an empty WebCore::String in case the prompt was accepted
        but the default implementation returned the null QString.

        The patch tried to avoid assign to result twice and
        was not checking the QString if it is null but the default
        value. This lead to always returning an empty string on
        successful prompts. Fix it by checking the variable 'x'
        for isNull.

        The manual test case used didn't cover the case of non
        empty input, replace it with an automatic test case that
        should cover all cases.

        * WebCoreSupport/ChromeClientQt.cpp:
        (WebCore::ChromeClientQt::runJavaScriptPrompt): Fix the bug.
        * tests/qwebpage/tst_qwebpage.cpp: Add automatic test case
(cherry picked from commit 4919286e4e9de496514f28432a81deb91d530fd1)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a54fd1...
Simon Hausmann [Mon, 25 Jan 2010 14:07:14 +0000 (15:07 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( a54fd11a3abcd6d9c858e8162e85fd1f3aa21db1 )

Changes in WebKit/qt since the last update:

Fix from Girish
(cherry picked from commit df4d9f46e370a35c3178d95cae2a873e8a23ddb5)

8 years agoNew Symbian signed sqlite3.sis with backup_registration.xml
Miikka Heikkinen [Tue, 2 Feb 2010 10:38:57 +0000 (12:38 +0200)]
New Symbian signed sqlite3.sis with backup_registration.xml

Sqlite3.sis was repackaged with backup_registration.xml to support
device backup/restore on Symbian

Task-number: QTBUG-7518
Reviewed-by: TrustMe
(cherry picked from commit 11bfc79b0f832f6544843ed13ef0efbcf51b22e9)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 0bc66e...
Simon Hausmann [Mon, 25 Jan 2010 13:55:28 +0000 (14:55 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 0bc66e2d86149e0fb6a33428e4f23ebfe83bfde4 )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2010-01-25  Janne Koskinen  <janne.p.koskinen@digia.com>

        Reviewed by Simon Hausmann.

        [Qt] Phone backup support for QtWebkit for Symbian devices.

        * symbian/backup_registration.xml: Added.
(cherry picked from commit efce7393cb8c6d7df52539dd7b7ac616cf46036c)

8 years agoAdded Symbian backup & restore support for Qt.sis and fluidlauncher.sis.
Miikka Heikkinen [Mon, 25 Jan 2010 08:53:27 +0000 (10:53 +0200)]
Added Symbian backup & restore support for Qt.sis and fluidlauncher.sis.

Task-number: QTBUG-7518
Reviewed-by: Janne Koskinen
(cherry picked from commit ad1bc0ae6500092cbfb75ab869b3757add7ba4b7)

8 years agoDocumented limitations of add/setLibraryPath(s) on Symbian OS
Miikka Heikkinen [Mon, 1 Feb 2010 15:03:12 +0000 (17:03 +0200)]
Documented limitations of add/setLibraryPath(s) on Symbian OS

Symbian OS limits applications to loading libraries only from /sys/bin
directory, so user defined library paths can only be useful for
locating Qt extension plugin stubs.

Task-number: QTBUG-7517
Reviewed-by: Janne Koskinen
(cherry picked from commit 00c4f1dbd8484ec887aea259021f5089334f45d7)

8 years agoAvoided the loss of preedit text when losing focus on Symbian.
axis [Thu, 28 Jan 2010 15:24:08 +0000 (16:24 +0100)]
Avoided the loss of preedit text when losing focus on Symbian.

It's annoying to lose preedit (e.g. underlined) text everytime a
focus switch occurs, especially because it can sometimes happen
while inside the FEP menus, such as "Insert symbol".

Fixed by committing the text in reset() implementation, rather than
discarding it.

Task:     QTBUG-7439
RevBy:    Sami Merila
(cherry picked from commit 01952109596f7563b43b12554fda0e4abc9a51ef)