7 years agoQSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian v4.7.0
Juha Turunen [Thu, 9 Sep 2010 07:59:49 +0000 (09:59 +0200)]
QSslSocketPrivate::systemCaCertificates() hangs sometimes on Symbian

The patch fixes the hanging issues on some Symbian devices that occurs while
retrieving certificates from the Symbian certificate store. The hanging was
caused by the certificate info array not being closed before exiting the
thread. This alone wouldn't make the existing implementation work, so the patch
replaces it with a pure Symbian style implementation which doesn't seem to be
affected (probably some OpenC threads issue).

Merge-request: 808
Reviewed-by: Shane Kearns
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Task: QTBUG-13033
(cherry picked from commit 5342be5ceffc84b56476fff57dd7d5e1bbfeb471)

7 years agoAdd exception barrier to QCertificateRetriever::RunL()
Shane Kearns [Thu, 8 Jul 2010 09:42:59 +0000 (11:42 +0200)]
Add exception barrier to QCertificateRetriever::RunL()

This translates stl exceptions into Symbian OS Leaves, to
prevent an assertion failure in the active scheduler.

Reviewed-by: mread
(cherry picked from commit 4f8ec542b123399574d2e509fa99f4bd66a34e25)

7 years agoReference correct declarative elements page.
Jesper Thomschutz [Thu, 9 Sep 2010 12:58:29 +0000 (14:58 +0200)]
Reference correct declarative elements page.
Done-by: Morten
Rev-by: Jesper
7 years agoQtWebKit: Update tag files to match the same content on qtwebkit.git
Jocelyn Turcotte [Tue, 7 Sep 2010 15:09:26 +0000 (17:09 +0200)]
QtWebKit: Update tag files to match the same content on qtwebkit.git

NOTE: Some patches have been made in the 4.7.0 branch for
src/3rdparty/webkit that are not available upstream.

This shouldn't have happened, however these patches mostly
address issues regarding builds of QtWebKit inside the Qt
source tree so it doesn't matter so much regarding source packages.

Reviewed-by: Simon Hausmann
(cherry picked from commit cb23007c0e04e8d23b426ca1a3672f70282012c7)

7 years agoQtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.
Jocelyn Turcotte [Tue, 7 Sep 2010 15:07:38 +0000 (17:07 +0200)]
QtWebKit: Downstream patch 2 fixing a crash on MSVC 64bit.


Sha1 on qtwebkit.git:

Reviewed-by: Simon Hausmann
(cherry picked from commit d027395181d3e0c5796340ff87f2cddb41b93d29)

7 years agoQtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.
Jocelyn Turcotte [Tue, 7 Sep 2010 15:05:46 +0000 (17:05 +0200)]
QtWebKit: Downstream patch 1 fixing a crash on MSVC 64bit.


Sha1 on qtwebkit.git:

Reviewed-by: Simon Hausmann
(cherry picked from commit b080eccb98ab861d6625b1980b323a62bed3d50a)

7 years agoDoc: updating the qdocconf files and the stylesheet
Morten Engvoldsen [Tue, 7 Sep 2010 08:55:06 +0000 (10:55 +0200)]
Doc: updating the qdocconf files and the stylesheet
QDocconf files was out of date in the section including extra files
Style now shows numbered lists corectly
(cherry picked from commit cbba0a1ea1e727cca4ca09c216e4f5a306083ba4)
(cherry picked from commit 288e8a2cd4be9033af39fb5d309e855a582081bd)

7 years agoDoc: updating details on Tier 2 platforms
Morten Engvoldsen [Tue, 7 Sep 2010 11:05:20 +0000 (13:05 +0200)]
Doc: updating details on Tier 2 platforms
(cherry picked from commit 6b0e60a2f70acd7daab068443e26741b7c44db63)
(cherry picked from commit 6c78c125f7201e146f43d74d90256ee97835cbd9)

7 years agoDoc: adding remark on release of qt quick element support in creator
Morten Engvoldsen [Tue, 7 Sep 2010 10:54:49 +0000 (12:54 +0200)]
Doc: adding remark on release of qt quick element support in creator
(cherry picked from commit 5d044a343e398386940ac5e4c968d1bdbe127427)
(cherry picked from commit 59ac4997c3c0759fccc39a0f1c72d95ab065059a)

7 years agoMerge branch '4.7.0' of scm.dev.nokia.troll.no:qt/qt-releases into 4.7.0
Toby Tomkins [Wed, 8 Sep 2010 05:05:09 +0000 (15:05 +1000)]
Merge branch '4.7.0' of scm.dev.nokia.troll.no:qt/qt-releases into 4.7.0

7 years agoUpdate configure.exe
Toby Tomkins [Wed, 8 Sep 2010 05:04:07 +0000 (15:04 +1000)]
Update configure.exe

7 years agoRevert "let WebKit inject itself into the qt configuration"
Jason McDonald [Wed, 8 Sep 2010 02:27:43 +0000 (12:27 +1000)]
Revert "let WebKit inject itself into the qt configuration"

This reverts commit b35310bba20f0c33a61b03ea4eec6108ec873a7c.

7 years agoRevert "fix qt_webkit_version.pri install for in-Qt builds"
Jason McDonald [Wed, 8 Sep 2010 02:27:33 +0000 (12:27 +1000)]
Revert "fix qt_webkit_version.pri install for in-Qt builds"

This reverts commit 2ed8ae55ea8e37060538bd45276e5f72e98f36c4.

7 years agoRevert "Fixed incorrect Symbian scoping."
Jason McDonald [Wed, 8 Sep 2010 02:27:16 +0000 (12:27 +1000)]
Revert "Fixed incorrect Symbian scoping."

This reverts commit bd9e8679703dfdd63f58be9ee29b73e73a0c3774.

7 years agoQS60Style: Itemviews are drawn incorrectly
Sami Merila [Wed, 1 Sep 2010 08:14:10 +0000 (11:14 +0300)]
QS60Style: Itemviews are drawn incorrectly

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
(cherry picked from commit 1ec0155c191e2818f56815ee4ddbf5d8982f1267)

7 years agoChange to commercial license headers in preparation for release.
Jason McDonald [Tue, 7 Sep 2010 07:31:25 +0000 (17:31 +1000)]
Change to commercial license headers in preparation for release.

Reviewed-by: Trust Me
7 years agoIncrease maximum heap size of minehunt demo to fix crashing on Symbian
Joona Petrell [Mon, 6 Sep 2010 09:20:29 +0000 (19:20 +1000)]
Increase maximum heap size of minehunt demo to fix crashing on Symbian

Task-number: QT-3821
Reviewed-by: Martin Jones
(cherry picked from commit 3113a91f50f12c8ee53f2e84f6b46fde6c2c1693)

7 years agoMerge branch '4.7.0' of scm.dev.nokia.troll.no:qt/qt-releases into 4.7.0
Jason McDonald [Tue, 7 Sep 2010 04:44:41 +0000 (14:44 +1000)]
Merge branch '4.7.0' of scm.dev.nokia.troll.no:qt/qt-releases into 4.7.0

7 years agoDoc: Adds line about non-support for Webkit on Solaris
Morten Engvoldsen [Fri, 3 Sep 2010 09:48:55 +0000 (11:48 +0200)]
Doc: Adds line about non-support for Webkit on Solaris
(cherry picked from commit 82ff6626eaabbaed83f3cdfc429a2d011701ba03)

7 years agoDoc: Updating the 3rd party lib used in Qt - including JQuery
Morten Engvoldsen [Thu, 2 Sep 2010 14:03:22 +0000 (16:03 +0200)]
Doc: Updating the 3rd party lib used in Qt - including JQuery
(cherry picked from commit fcf01687c7209f2b4222bd12d8fe4a871380e65b)

7 years agoDoc: Fixing links on index page and corecting HTML in the template.
Morten Engvoldsen [Fri, 3 Sep 2010 11:37:56 +0000 (13:37 +0200)]
Doc: Fixing links on index page and corecting HTML in the template.
(cherry picked from commit 78381dbc9701015aef43736fb7d22cf6e66984c7)

7 years agoRecreate Qt 4.7.0 def files over Qt 4.6.3
Joona Petrell [Mon, 6 Sep 2010 04:07:16 +0000 (14:07 +1000)]
Recreate Qt 4.7.0 def files over Qt 4.6.3

7 years agoFixed incorrect Symbian scoping.
axis [Mon, 6 Sep 2010 14:23:35 +0000 (16:23 +0200)]
Fixed incorrect Symbian scoping.

The missing install functionality is only true for mmp based systems.
(cherry picked from commit 08c34bfec8880600138846bb895e82f69cb3f92c)

7 years agofix qt_webkit_version.pri install for in-Qt builds
Oswald Buddenhagen [Tue, 31 Aug 2010 13:02:16 +0000 (15:02 +0200)]
fix qt_webkit_version.pri install for in-Qt builds

always add the target, even if building inside Qt - as opposed to the
headers and libraries, there are no rules for that coming from

Task-number: QTBUG-13306
(cherry picked from commit a37dfcfdaa8029f25217fdec6dd6ec1a46929af2)

7 years agolet WebKit inject itself into the qt configuration
Oswald Buddenhagen [Tue, 17 Aug 2010 16:59:51 +0000 (18:59 +0200)]
let WebKit inject itself into the qt configuration

i.e., don't explicitly deal with qt_webkit_version.pri outside of the
webkit source directory.

Task-number: QTBUG-12379
Reviewed-by: Simon Hausmann
(cherry picked from commit b5b6cbb477b50c582d545b0e5e3a04626834e7e2)

7 years agoFix remote crash in delivering D-Bus calls with too few arguments
Thiago Macieira [Thu, 2 Sep 2010 15:09:13 +0000 (17:09 +0200)]
Fix remote crash in delivering D-Bus calls with too few arguments

Patch by Christoph Feck.
Task-number: QTBUG-13348
Reviewed by me
(cherry picked from commit 4b7346a4bd30705ab5910d448ec56daa6568aa90)

7 years agoDoc: Updated Supported Platforms page. Finished
Morten Engvoldsen [Thu, 2 Sep 2010 11:55:31 +0000 (13:55 +0200)]
Doc: Updated Supported Platforms page. Finished
(cherry picked from commit adcd745d6ef2dbd68a28e932e2a8961b70bece09)

7 years agoAdd three new style-hints to QFont to match CSS' generic font families
Tor Arne Vestbø [Mon, 5 Jul 2010 15:38:51 +0000 (17:38 +0200)]
Add three new style-hints to QFont to match CSS' generic font families

The defaults were chosen to match major web browsers. See:


Reviewed-by: Simon Hausmann
(cherry picked from commit 6d5655089fa4e2231a1a8edc98ecbb6b29e344e1)

7 years agoBetter fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
Aaron McCarthy [Fri, 13 Aug 2010 03:58:46 +0000 (13:58 +1000)]
Better fix for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.

Wrap new APIs in ifndef QT_MOBILITY_BEARER.
(cherry picked from commit 7e4807fed07e4c96086af00338601223b3353d29)

7 years agocompilation with QT_NO_DEPRECATED
Jason McDonald [Mon, 6 Sep 2010 05:13:38 +0000 (15:13 +1000)]
compilation with QT_NO_DEPRECATED

Reviewed-by: Andreas Kling
(cherry picked from commit 033b53a02fb02c5aec412e3d87ad9661110c6e6e)



7 years agoFix QStaticText copy constructor to also copy text option property
Eskil Abrahamsen Blomfeldt [Fri, 3 Sep 2010 10:48:01 +0000 (12:48 +0200)]
Fix QStaticText copy constructor to also copy text option property

The text option property of QStaticText was not copied in the copy
constructor, so when the text was detached, the property would be
reset to the default.

Task-number: QTBUG-13368
Reviewed-by: Gunnar
(cherry picked from commit 200d1743dcdacf1036384f746046e55d91ccd918)

7 years agoqdoc: Ensured that text is encoded correctly.
David Boddie [Tue, 10 Aug 2010 13:03:59 +0000 (15:03 +0200)]
qdoc: Ensured that text is encoded correctly.
(cherry picked from commit 9986c3f0c0681c7ea8bc8e5cfea5662880db6654)

7 years agoqdoc: Fixed non-well-formed markup.
Jason McDonald [Mon, 6 Sep 2010 02:58:43 +0000 (12:58 +1000)]
qdoc: Fixed non-well-formed markup.

Reviewed-by: Trust Me
To-be-really-reviewed-by: Qt Doc Team
(cherry picked from commit 3833dc0a0535fa8320e17c741ca2746e9bebcaa9)



7 years agoAdded missing code to bring web browser foreground in Symbian.
Janne Anttila [Fri, 3 Sep 2010 11:22:58 +0000 (14:22 +0300)]
Added missing code to bring web browser foreground in Symbian.

Task-number: QTBUG-8336
Reviewed-by: Miikka Heikkinen
(cherry picked from commit d5373433d2a6d632e06d3873003069d49e17e2cd)

7 years agoAdding missing image
Kevin Wright [Tue, 27 Jul 2010 12:57:47 +0000 (14:57 +0200)]
Adding missing image
(cherry picked from commit 7f9205aa572c60085c9e9f38749bb48e707fea95)

7 years agoFixed a broken def file entry.
axis [Fri, 30 Jul 2010 06:40:39 +0000 (08:40 +0200)]
Fixed a broken def file entry.
(cherry picked from commit 7e8073b37a8a3e58d82b71934f085ec8143935eb)

7 years agoModified file/directory names and text to remove disallowed terminology.
Kevin Wright [Tue, 27 Jul 2010 07:22:24 +0000 (09:22 +0200)]
Modified file/directory names and text to remove disallowed terminology.
(cherry picked from commit a02eba0de0fcf9a17d489ee1f92977c95d3afd76)

7 years agoDoc: removing bug breaking the article into pages. These pages was not linked anywhere.
Morten Engvoldsen [Wed, 1 Sep 2010 12:52:45 +0000 (14:52 +0200)]
Doc: removing bug breaking the article into pages. These pages was not linked anywhere.
(cherry picked from commit 08854de08165027acd3973876f1fffd6a1ed120f)

7 years agoFixed input context trying to squeeze content into a full widget.
axis [Wed, 1 Sep 2010 11:53:32 +0000 (13:53 +0200)]
Fixed input context trying to squeeze content into a full widget.

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)

7 years agoCleaned up position tracking in the Symbian input methods.
axis [Tue, 31 Aug 2010 11:15:28 +0000 (13:15 +0200)]
Cleaned up position tracking in the Symbian input methods.

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)

7 years agoRevert "Long-press shortcuts for symbols on QWERTY keyboard don't work"
axis [Fri, 27 Aug 2010 08:31:39 +0000 (10:31 +0200)]
Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"

This reverts commit 05eacd9ad40f8adb5aaa12a8b90113a73b43f642.


(cherry picked from commit c5901037f0d3ccd45b0c79b38ef5b04552dad0aa)

7 years agoDon't overflow the unreferenced cost counter
Aaron Kennedy [Thu, 2 Sep 2010 07:27:57 +0000 (17:27 +1000)]
Don't overflow the unreferenced cost counter

(cherry picked from commit b6d47ea4872e188d8da6886cb1922f1a89245825)

7 years agoFix a crash when passing a null pixmap to QPainter::drawPixmapFragments().
Trond Kjernåsen [Wed, 1 Sep 2010 10:33:55 +0000 (12:33 +0200)]
Fix a crash when passing a null pixmap to QPainter::drawPixmapFragments().

Task-number: QTBUG-13331
Reviewed-by: Samuel
(cherry picked from commit dcb98430f6add24c9d54253bd35d35010cc75c23)

7 years agoFix compiling issue for FreeType version earlier than 2.1.10
Jiang Jiang [Mon, 30 Aug 2010 12:03:37 +0000 (14:03 +0200)]
Fix compiling issue for FreeType version earlier than 2.1.10

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)

7 years agoUpdate QDesktopWidget geometry when S60 furniture visibility changes
Gareth Stockwell [Thu, 2 Sep 2010 12:07:59 +0000 (13:07 +0100)]
Update QDesktopWidget geometry when S60 furniture visibility changes

Task-number: QTBUG-13204
Reviewed-by: axis
(cherry picked from commit 55b067d14d8c12bd29b03c17e0281a11a49f95ca)

7 years agoEnsure geometry of top-level widget accounts for S60 screen furniture
Gareth Stockwell [Wed, 18 Aug 2010 14:36:09 +0000 (15:36 +0100)]
Ensure geometry of top-level widget accounts for S60 screen furniture

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)

7 years agoClear Qt::WA_OutsideWSRange when making window fullscreen
Gareth Stockwell [Mon, 26 Jul 2010 13:04:52 +0000 (14:04 +0100)]
Clear Qt::WA_OutsideWSRange when making window fullscreen

Task-number: QTBUG-10269
Reviewed-by: Jason Barron
(cherry picked from commit 859cca02a89ecadbb5578bb113e535374bcfcaca)

7 years agoPrevent null pointer dereference
Gareth Stockwell [Thu, 2 Sep 2010 12:03:50 +0000 (13:03 +0100)]
Prevent null pointer dereference

Task-number: QTBUG-13204
Reviewed-by: axis
(cherry picked from commit 9d88ff485e93e9701719263ce0a46cb86b0398ca)

7 years agoRemove extra strings
Alan Alpert [Thu, 2 Sep 2010 00:58:32 +0000 (10:58 +1000)]
Remove extra strings
(cherry picked from commit 661e237be622a5f7886cee7c06f9daa73d4a07d7)

7 years agoWithout Declarative, still build and run QtDemo
Alan Alpert [Thu, 19 Aug 2010 06:35:40 +0000 (16:35 +1000)]
Without Declarative, still build and run QtDemo

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)

7 years agoUpdate Polish translations
Jarek Kobus [Fri, 23 Jul 2010 09:16:39 +0000 (11:16 +0200)]
Update Polish translations
(cherry picked from commit 5e0371250d050f619d3c7c635377213ece733e66)

7 years agoUpdated some URLs and required tools versions for Symbian
Miikka Heikkinen [Fri, 27 Aug 2010 07:21:03 +0000 (10:21 +0300)]
Updated some URLs and required tools versions for Symbian

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

7 years agoRefactored handling of window visibility events on Symbian
Gareth Stockwell [Tue, 17 Aug 2010 15:05:01 +0000 (16:05 +0100)]
Refactored handling of window visibility events on Symbian

Task-number: QTBUG-12817
Reviewed-by: Jason Barron
(cherry picked from commit ea85300f6456ef1bd9702296f3068edf0795736e)

7 years agoReplaced backing store reference count with list of visible widgets
Gareth Stockwell [Tue, 10 Aug 2010 15:34:19 +0000 (16:34 +0100)]
Replaced backing store reference count with list of visible widgets

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)

7 years agoFix for memory leak in qt_init
Shane Kearns [Fri, 13 Aug 2010 11:59:55 +0000 (12:59 +0100)]
Fix for memory leak in qt_init

Reviewed-by: Miikka Heikkinen
(cherry picked from commit 5d32b723332acab5fdf880aa0d555ab8e05d79dd)

7 years agoCorrecting spelling mistakes in documentation. Part of fix for QTBUG-11938.
Jason McDonald [Thu, 2 Sep 2010 06:33:35 +0000 (16:33 +1000)]
Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.

Reviewer: David Boddie
Task number: QTBUG-11938
(cherry picked from commit eea84818e98af917d3cf2bf04ea17a416ef9d55e)



7 years agoPending surface might not get destroyed if no flush() happens
Jani Hautakangas [Mon, 9 Aug 2010 06:47:31 +0000 (09:47 +0300)]
Pending surface might not get destroyed if no flush() happens
in between graphics system change. This patch ensures that all
old surfaces are destroyed before new graphics system is

Reviewed-by: Jason Barron
(cherry picked from commit d3ab1fccea2b1e011e7518269a29045a53f0a30b)

7 years agoUse ARGB32 premultiplied backing store format in Symbian^3
Jani Hautakangas [Fri, 6 Aug 2010 10:18:24 +0000 (13:18 +0300)]
Use ARGB32 premultiplied backing store format in Symbian^3
raster paint engine for translucent windows.

Task-number: QTBUG-12710
Reviewed-by: Jason Barron
(cherry picked from commit 0210bbbd7bf8254be5f7f19f524068cd39fc34c2)

7 years agoRegister window types for Symbian system effects
Jani Hautakangas [Fri, 6 Aug 2010 07:09:16 +0000 (10:09 +0300)]
Register window types for Symbian system effects

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)

7 years agoRemove the memory tracking attempt from the runtime graphics system.
Jason Barron [Wed, 4 Aug 2010 14:09:04 +0000 (16:09 +0200)]
Remove the memory tracking attempt from the runtime graphics system.

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)

7 years agoRemoved static on a member that didn't have to be.
axis [Wed, 28 Jul 2010 14:10:40 +0000 (16:10 +0200)]
Removed static on a member that didn't have to be.

One step further towards no static data...

RevBy:    Trust me
(cherry picked from commit ddbffbe7271cfdd3935c188ccb8e804ad73627f6)

7 years agoEnsure that window rectangle is updated when CBA visibility changes
Gareth Stockwell [Tue, 27 Jul 2010 15:23:52 +0000 (16:23 +0100)]
Ensure that window rectangle is updated when CBA visibility changes

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)

7 years agoFix crash caused by not clearing the QPixmapCache on application exit.
Oleh Vasyura [Wed, 21 Jul 2010 10:48:57 +0000 (13:48 +0300)]
Fix crash caused by not clearing the QPixmapCache on application exit.

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

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)

7 years agoTest backing store is deleted after reparenting a visible native child widget
Gareth Stockwell [Tue, 10 Aug 2010 16:08:37 +0000 (17:08 +0100)]
Test backing store is deleted after reparenting a visible native child widget

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)

7 years agoEnsure native window is considered invisible when it gets destroyed
Gareth Stockwell [Wed, 11 Aug 2010 11:58:29 +0000 (12:58 +0100)]
Ensure native window is considered invisible when it gets destroyed

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

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)

7 years agoTest backing store is deleted after: partial reveal, full reveal, hide
Gareth Stockwell [Tue, 10 Aug 2010 15:30:18 +0000 (16:30 +0100)]
Test backing store is deleted after: partial reveal, full reveal, hide

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)

7 years agoUpdated Twitter demo in response to the new Twitter oauth requirement
Jens Bache-Wiig [Tue, 31 Aug 2010 13:13:21 +0000 (15:13 +0200)]
Updated Twitter demo in response to the new Twitter oauth requirement

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)

7 years agoAdd quit buttons to declarative demos
Joona Petrell [Thu, 26 Aug 2010 03:31:27 +0000 (13:31 +1000)]
Add quit buttons to declarative demos

Task-number: QTBUG-13048
Reviewed-by: Martin Jones
(cherry picked from commit 2af41f34eca0effced19b59d4c3327e3e4b627cb)

7 years agoFix minehunt demo for Symbian
Joona Petrell [Fri, 20 Aug 2010 04:09:51 +0000 (14:09 +1000)]
Fix minehunt demo for Symbian

Task-number: QTBUG-8927
Reviewed-by: Alan Alpert
(cherry picked from commit e8141d3eff43e419f566449f42f9548ce54acf70)

7 years agodoc: Remove \internal tag from QScriptProgram
Kent Hansen [Tue, 31 Aug 2010 11:52:14 +0000 (13:52 +0200)]
doc: Remove \internal tag from QScriptProgram

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)

7 years agoDestroy QNetworkConfigurationManager global static from qApp dtor.
Aaron McCarthy [Wed, 1 Sep 2010 05:24:25 +0000 (15:24 +1000)]
Destroy QNetworkConfigurationManager global static from qApp dtor.

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)

7 years agoFix QStaticText with OpenGL1 engine
Eskil Abrahamsen Blomfeldt [Mon, 30 Aug 2010 15:08:48 +0000 (17:08 +0200)]
Fix QStaticText with OpenGL1 engine

Like OpenGL2 and OpenVG, the OpenGL1 paint engine also transforms text
coordinates itself and does not require QStaticText to use device

Task-number: QTBUG-13228
Reviewed-by: Samuel
(cherry picked from commit d0f1f569e27f7f34f3bfc03bd759f28f7b567997)

7 years agoApparently QPen::brush() can't return a NoBrush for a NoPen.
Trond Kjernåsen [Fri, 27 Aug 2010 09:13:16 +0000 (11:13 +0200)]
Apparently QPen::brush() can't return a NoBrush for a NoPen.

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)

7 years agoAdd a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
Trond Kjernåsen [Thu, 26 Aug 2010 15:00:50 +0000 (17:00 +0200)]
Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
(cherry picked from commit 3db2df0a33952223ef0e1a087329ada7f2b2d3ea)

7 years agoFix mispositioned text with QStaticText and OpenVG graphics system
Eskil Abrahamsen Blomfeldt [Tue, 24 Aug 2010 13:06:39 +0000 (15:06 +0200)]
Fix mispositioned text with QStaticText and OpenVG graphics system

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)

7 years agoAdd text decoration support to QStaticText
Jiang Jiang [Mon, 9 Aug 2010 13:56:34 +0000 (15:56 +0200)]
Add text decoration support to QStaticText

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)

7 years agoDoing "import foo.qml" doesn't work in QML anymore
Bea Lam [Fri, 20 Aug 2010 01:10:44 +0000 (11:10 +1000)]
Doing "import foo.qml" doesn't work in QML anymore

Task-number: QTBUG-13042
(cherry picked from commit 1f515224d52c9a33b46bbf926e82d5c2df1a84e4)

7 years agoDoc: Fixes to Qt Quick documentation.
Jason McDonald [Thu, 2 Sep 2010 05:48:56 +0000 (15:48 +1000)]
Doc: Fixes to Qt Quick documentation.

Reviewed-by: Trust Me
To-be-verified-by: Qt Doc Team
(cherry picked from commit f33359fb0c56fe88e0ae3c564b7847f90889eac2)



7 years agoDoc: Removed invalid entities in documentation.
Jason McDonald [Thu, 2 Sep 2010 05:30:45 +0000 (15:30 +1000)]
Doc: Removed invalid entities in documentation.

Details: It is not necessary to use entities. In any case, I replaced
them with words for consistency.
(cherry picked from commit 58d0e46dcc50a3cddabc177c9dfdfec5c66e932d)



7 years agoFix crash when all the items in a QListView are hidden
Jason McDonald [Thu, 2 Sep 2010 04:13:14 +0000 (14:13 +1000)]
Fix crash when all the items in a QListView are hidden

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

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)



7 years agoDoc: Adding text to GS page
Morten Engvoldsen [Thu, 5 Aug 2010 08:00:24 +0000 (10:00 +0200)]
Doc: Adding text to GS page
(cherry picked from commit a6937c7d8d2253c0f230254eaa2b9c8042972b30)

7 years agoDoc: Images for QML GS
Morten Engvoldsen [Thu, 5 Aug 2010 09:33:24 +0000 (11:33 +0200)]
Doc: Images for QML GS
(cherry picked from commit 2faafdeda4c715a91297b56251773b21a0cac86b)

7 years ago Doc: Added new getting started document.
Jesper Thomschutz [Wed, 1 Sep 2010 09:51:49 +0000 (11:51 +0200)]
Doc: Added new getting started document.
(cherry picked from commit 583d68c72ae58c1b35c2ffba733b7e68a32dc2f9)



7 years agoconfigure.exe: don't write the QT_NAMESPACE define to .qmake.cache
Joerg Bornemann [Tue, 10 Aug 2010 15:17:27 +0000 (17:17 +0200)]
configure.exe: don't write the QT_NAMESPACE define to .qmake.cache

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)

7 years agoWorkaround for QTBUG-8013: Do not return an ascent of 0
Alessandro Portale [Tue, 27 Jul 2010 11:55:43 +0000 (13:55 +0200)]
Workaround for QTBUG-8013: Do not return an ascent of 0

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)

7 years agoDoc: Fixed typo in a shortcut string.
David Boddie [Wed, 4 Aug 2010 14:32:00 +0000 (16:32 +0200)]
Doc: Fixed typo in a shortcut string.

Reviewed-by: Trust Me
Task-number: QTBUG-12355
(cherry picked from commit 3378fe13f8d865463c79f34017a1d82e03cdf147)

7 years agoDocument that animations have to be started/stopped as a group
Bea Lam [Tue, 27 Jul 2010 01:09:14 +0000 (11:09 +1000)]
Document that animations have to be started/stopped as a group
(cherry picked from commit 6c7ed006b0a1f006e11fd5f78dd996d65114fc98)

7 years agoIncrease drag distance on Symbian to improve finger usability on capacitive screens
Joona Petrell [Thu, 5 Aug 2010 04:03:57 +0000 (14:03 +1000)]
Increase drag distance on Symbian to improve finger usability on capacitive screens

Task-number: QTBUG-12594
Reviewed-by: Martin Jones
(cherry picked from commit 89e723153b15af5d3acbeb859d4f35bf52f8e250)

7 years agoPhonon; Use correct Phonon version numbers.
Justin McPherson [Tue, 3 Aug 2010 23:53:47 +0000 (09:53 +1000)]
Phonon; Use correct Phonon version numbers.

Task-number: QTBUG-12627
Reviewed-by: Andrew den Exter
(cherry picked from commit 5569070c39a5778cb9e2ff1bab32993217e788c5)

7 years agoAdded documentation for Spectrum Analyzer demo
Gareth Stockwell [Tue, 10 Aug 2010 09:39:07 +0000 (10:39 +0100)]
Added documentation for Spectrum Analyzer demo

Task-number: QTBUG-12720
Reviewed-by: David Boddie
(cherry picked from commit 8adeb2742a701080c7e6568a6aca1f27079e1909)

7 years agoChanged width of the document. Part of the fix for QTBUG-12180
Jerome Pasion [Fri, 6 Aug 2010 07:42:28 +0000 (09:42 +0200)]
Changed width of the document. Part of the fix for QTBUG-12180
(cherry picked from commit 4808151512faef0d78152905885bd3009b89c1a6)

7 years agoPathView required some diagonal movement before a drag was initiated.
Martin Jones [Mon, 9 Aug 2010 06:11:30 +0000 (16:11 +1000)]
PathView required some diagonal movement before a drag was initiated.
Any movement beyond the threshold is sufficient.

Task-number: 12747
Reviewed-by: Joona Petrell
(cherry picked from commit 44d5bcde1713a5f51b7140259e9fd4e426a868a8)

7 years agoXmlListModel doc fixes
Bea Lam [Mon, 9 Aug 2010 07:08:23 +0000 (17:08 +1000)]
XmlListModel doc fixes

Task-number: QTBUG-12749
(cherry picked from commit 0d060e71a5a03f21df5b2edbb4f6de1e928b9ada)

7 years agoconfigure: fix error message when calling config.status
Joerg Bornemann [Mon, 9 Aug 2010 15:38:05 +0000 (17:38 +0200)]
configure: fix error message when calling config.status

Calling configure in a shadow build directory led to error messages
when trying to delete the content of $$QT_BUILD_TREE/mkspecs.

Task-number: QTBUG-12764
Reviewed-by: ossi
(cherry picked from commit af3a204b8b3e780438c39425ba74338cc6a46a80)

7 years agoDon't build bearercloud example if Qt was build w/o SVG support
Alex [Wed, 11 Aug 2010 04:32:51 +0000 (14:32 +1000)]
Don't build bearercloud example if Qt was build w/o SVG support

Task-number: QTBUG-12791
Reviewed-by: David Laing
(cherry picked from commit 0d4d065cc9757159c5b6fa817892f5707bc1ecae)

7 years agoCrash in QX11PaintEngine::drawPixmap
Carlos Manuel Duclos Vergara [Wed, 11 Aug 2010 13:47:40 +0000 (15:47 +0200)]
Crash in QX11PaintEngine::drawPixmap

We receive a pixmap as a const reference and then we convert it to an
X11 pixmap. This conversion could fail for many reasons, however we
were not looking at the result of this conversion.
This patch was contributed by Christoph Feck from KDE.

Task-number: QTBUG-12826
Reviewed-by: Samuel
(cherry picked from commit 8e7fb343372acd0bc5fe04db7a5c5542541d4538)

7 years agoFix broken example code
Bea Lam [Thu, 12 Aug 2010 01:32:56 +0000 (11:32 +1000)]
Fix broken example code

Task-number: QTBUG-12839
(cherry picked from commit 59d36ea601aef6182cba0e0f5fc56cc102e29c59)

7 years agoFixed autotest compilation issue on solaris
Thierry Bastian [Thu, 19 Aug 2010 16:09:47 +0000 (18:09 +0200)]
Fixed autotest compilation issue on solaris

Task-number: QTBUG-12991
(cherry picked from commit ba277e9ce92dc40e648f6c83a7cd9f01dd33b886)

7 years agoFixed build issue on Solaris
Thierry Bastian [Thu, 19 Aug 2010 16:05:12 +0000 (18:05 +0200)]
Fixed build issue on Solaris

Task-number: QTBUG-12994
(cherry picked from commit d30921f13dc74a3e05a3f29c0c45147823f2a064)

7 years agoqdoc: Fixed erroneous links to QML basic types.
Martin Smith [Wed, 25 Aug 2010 13:42:16 +0000 (15:42 +0200)]
qdoc: Fixed erroneous links to QML basic types.

Task-nr: QTBUG-13096
(cherry picked from commit 002c89aeb44c805d642be2d4e4a19422be877bc2)