qt:kde-qt.git
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.

Conflicts:

src/gui/inputmethod/qcoefepinputcontext_p.h
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
(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

QTBUG-13345
(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)

Conflicts:

src/script/api/qscriptcontext.cpp

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
activated.

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
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)

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
     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)

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
coordinates.

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)

Conflicts:

doc/src/declarative/declarativeui.qdoc
doc/src/external-resources.qdoc

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)

Conflicts:

doc/src/getting-started/examples.qdoc

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
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

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)

Conflicts:

doc/src/getting-started/gettingstarted.qdoc

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)

7 years agoCocoa: Demo browser can get stuck after closing modal dialog
Richard Moe Gustavsen [Thu, 26 Aug 2010 09:10:02 +0000 (11:10 +0200)]
Cocoa: Demo browser can get stuck after closing modal dialog

This turns out to be a glitch in the event dispatcher for Qt/Cocoa.
The problem is that you can, in some really slim cases it must be, end up
calling processEvents with the exec flag set, while the current modal
dialog has been told to leave modal. In that case, we recurse into
a new event dispatching loop for a session that is about to die. And
that causes problems when the session actually dies. This patch makes
sure that you cannon start spinning a session that is about to die, by
setting the sessionCache to zero.

Task-number: QTBUG-13164
Reviewed-by: Tor Arne
(cherry picked from commit a373648fa876a9684394aa9b7ecafd51e53f4742)

7 years agoLink to the unsinstalled libraries first.
Petri Latvala [Wed, 7 Jul 2010 13:30:14 +0000 (16:30 +0300)]
Link to the unsinstalled libraries first.

Task-number: QT-3371
Reviewed-by: Harald Fernengel
(cherry picked from commit f231bd03007484d239cb5456db9e20a1f9ab7a63)

7 years agoDoc: Fixed qdoc warnings.
Jesper Thomschutz [Tue, 24 Aug 2010 13:25:45 +0000 (15:25 +0200)]
Doc: Fixed qdoc warnings.

Reviewed-by: Trust Me
(cherry picked from commit cb086eb5340c4c41efaf45373aa05c37e8aa974a)

Conflicts:

doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp

7 years agoDoc: updating getting started docs - not finished
Jesper Thomschutz [Tue, 24 Aug 2010 12:53:10 +0000 (14:53 +0200)]
Doc: updating getting started docs - not finished
(cherry picked from commit b83f3a98fe5688872b4bd9a871e544951cb33e29)

Conflicts:

doc/src/getting-started/gettingstarted.qdoc

7 years agoMake it possible again to build Qt without webkit
Simon Hausmann [Tue, 27 Jul 2010 11:46:00 +0000 (13:46 +0200)]
Make it possible again to build Qt without webkit

Remove the QT_CONFIG line from the qt_webkit_version.pri file in Qt,
because it is only meaningful for separate builds of WebKit.

(Real fix is in the import script that takes care of always
removing that line)

Task-number: QTBUG-12456
Discussed-with: axis
(cherry picked from commit 4cd413970b18125885ce60d82a4ad06bce6395a5)

7 years agoDoc: fixing creator bugs, removing menus and textbox in the header
Morten Engvoldsen [Fri, 20 Aug 2010 12:00:36 +0000 (14:00 +0200)]
Doc: fixing creator bugs, removing menus and textbox in the header
(cherry picked from commit 4aafc4e55e0906be0cc39911b2c1a4ffe71c4d91)

7 years agoFixing qdoc index file...Commit hack to work around the massive amounts of dependenci...
Jesper Thomschutz [Mon, 23 Aug 2010 11:33:04 +0000 (13:33 +0200)]
Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch.
Rev-by: MortenE
7 years agoDoc: Fixing overlapping text in header list
Morten Engvoldsen [Wed, 18 Aug 2010 11:37:21 +0000 (13:37 +0200)]
Doc: Fixing overlapping text in header list
(cherry picked from commit ccb77caba466fe0e4d28a809129513cefdbd5575)

7 years agoUse Ctrl rather than Alt for switching tabs in the demo browser
Tor Arne Vestbø [Thu, 19 Aug 2010 15:27:10 +0000 (17:27 +0200)]
Use Ctrl rather than Alt for switching tabs in the demo browser

Alt+1, Alt+2, etc produce actual symbols on some keyboard layouts,
for example Norwegian, which prevents you from typing the @ symbol.

Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
(cherry picked from commit 5b177dd50d1ea0eb9130c631757a687782a23cd3)

7 years ago Doc: add link to new gettings started to index.html
Geir Vattekar [Wed, 28 Jul 2010 09:03:00 +0000 (11:03 +0200)]
Doc: add link to new gettings started to index.html
(cherry picked from commit 613ab517f46085580e81684cd5072f8c90fe84d5)

7 years agoDoc: Fixing bug involving header misplacement in Creator style
Morten Engvoldsen [Wed, 11 Aug 2010 10:45:58 +0000 (12:45 +0200)]
Doc: Fixing bug involving header misplacement in Creator style

Task-number: QTBUG-11408
(cherry picked from commit 997e4161cf937aa34a16bb2e708fa1bc7909355f)

7 years agoCocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15
Richard Moe Gustavsen [Tue, 17 Aug 2010 15:33:42 +0000 (17:33 +0200)]
Cocoa: revert parts of cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15

The reason is that we tried to fix the stacking order of child windows
while we fixed a crash. But the patch turned out to break an auto-test

Reviewed-by: prasanth
(cherry picked from commit 749ad26d255327c9fa3fe857a30983cc6dfef0d9)

7 years agoRevert "Fix the rendering of lines with the X11 paint engine"
Samuel Rødal [Wed, 18 Aug 2010 15:17:15 +0000 (17:17 +0200)]
Revert "Fix the rendering of lines with the X11 paint engine"

This reverts commit ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6,
which broke fill / outline consistency, and when trying to fix that
by rounding the fill the same way that broke rendering in Creator.

Unfortunately the X11 paint engine is too sensitive to changes, there
have already been tons of patches to make it as consistent as possible.
It's simply not possible to get the same rounding for both fill and
outlines and at the same time have consistency between fill and outline
(no holes or fill outside the outline), while using the integer based
Xlib rendering API. Hopefully in 4.8 we'll switch to raster and the X11
paint engine will be a legacy.

Reviewed-by: Trond
(cherry picked from commit 041a68007413a20a9a9c97d0f2f04f9e03428f67)

7 years agoRevert "Outline / fill inconsistency in X11 paint engine."
Samuel Rødal [Wed, 18 Aug 2010 15:06:19 +0000 (17:06 +0200)]
Revert "Outline / fill inconsistency in X11 paint engine."

This reverts commit ff405f5623d7ed18c881c097368e3e9afd2e9443.

Reviewed-by: Trond
(cherry picked from commit 3014b427aa8700890f9bd8ea2a0300fc152bf3d2)

7 years agoOutline / fill inconsistency in X11 paint engine.
Samuel Rødal [Tue, 17 Aug 2010 08:45:17 +0000 (10:45 +0200)]
Outline / fill inconsistency in X11 paint engine.

Change ebbab30af417dfbf3df47dec15c0e2f8d6a30fa6 broke outline / fill
consistency in the X11 engine. Since the positioning of lines is more
important we'll round the fill coordinates the same way.

The bug was visible in the filltest.qps arthur test.

Reviewed-by: Gunnar Sletta
(cherry picked from commit ff405f5623d7ed18c881c097368e3e9afd2e9443)

7 years agofix loading of module configs
Oswald Buddenhagen [Fri, 6 Aug 2010 16:17:22 +0000 (18:17 +0200)]
fix loading of module configs

do it in qt_config.prf instead of in the autogenerated qconfig.pri
files. this is waaaay more elegant, and allows us to easily use the
magic in that file which avoids loading qt configuration from the qt
install dir while building qt itself.

Reviewed-by: joerg
Reviewed-by: Simon Hausmann
Task-number: QTBUG-12698

7 years agoPrevented Xorg crash in qtdemo when running corkboards example.
Samuel Rødal [Tue, 17 Aug 2010 08:29:03 +0000 (10:29 +0200)]
Prevented Xorg crash in qtdemo when running corkboards example.

The crash happens in the Nvidia driver in glXReleaseTexImageEXT when
scrolling the corkboard using the mouse. To work around it we detect the
Nvidia driver versions where this is known to be a problem and skip
using the texture from pixmap extension in those cases.

Task-number: QTBUG-12914
Reviewed-by: Trond
(cherry picked from commit a76b8bf67696ae69888cc6237417e7c8f07f8da6)

7 years agoCocoa: parent windows shows on screen when they should be hidden
Richard Moe Gustavsen [Tue, 17 Aug 2010 08:08:20 +0000 (10:08 +0200)]
Cocoa: parent windows shows on screen when they should be hidden

The reason is the cocoa method that adds a window as a child of another,
it ends up showing both the parent and the child window regardless.
And this could in some cases also cause a crash.
So we therefore need to be careful when calling that function, and be
sure that the parent is actually visible. In addition, addChildWindow
reset the stacking level of the child window, and made e.g. normal
child windows pop in front of tool child windows. This could easily
be seen in e.g. Designer.

Task-number: QTBUG-12866
Reviewed-by: prasanth
(cherry picked from commit cc6dc0aeefde881a95f5fea2b26f2f3d7bdc6e15)

7 years agoMake this constructor explicit in Qt too.
Aaron McCarthy [Fri, 13 Aug 2010 04:01:52 +0000 (14:01 +1000)]
Make this constructor explicit in Qt too.
(cherry picked from commit 167b63d2250e7923d7b660076a80e82af07d9cdb)

7 years agoFix configure -help output. declarative module is built by default.
Martin Jones [Fri, 13 Aug 2010 00:10:38 +0000 (10:10 +1000)]
Fix configure -help output.  declarative module is built by default.

Task-number: QTBUG-12840
(cherry picked from commit d904fe2273be5d39b54b987eef6b9cc0d1b85c4b)

7 years agoCompile on Symbian
Martin Jones [Wed, 11 Aug 2010 03:58:08 +0000 (13:58 +1000)]
Compile on Symbian

Task-number: QTBUG-12771
(cherry picked from commit e8d3e8e0b93271bb41fcdc264fc10ec59be5aa20)

7 years agoDon't destroy ListModel child list nodes.
Martin Jones [Wed, 11 Aug 2010 00:04:53 +0000 (10:04 +1000)]
Don't destroy ListModel child list nodes.
These are owned by the root and must not be destroyed by child lists.

Task-number: QTBUG-12771
Reviewed-by: Bea Lam
(cherry picked from commit 4026b2c7bc91f8f25f73b182687d5d2bed823217)

7 years agodiagramscene example: fix leak and crashes.
Olivier Goffart [Fri, 13 Aug 2010 10:23:46 +0000 (12:23 +0200)]
diagramscene example: fix leak and crashes.

In MainWindow::deleteItem, if there is arrow selected, we need to clean
up the items from this arrow. We need to delete them first so there is no
arrow in the list anymore when we calls removeArrows (which before,
deleted arrow that were possibly in the list, resulting in crashes)

Also avoid leak by giving parents to objects that needs it, and destroying items.

Reviewed-by: Geir Vattekar
Task-number: QTBUG-12753
(cherry picked from commit 5dedcd3c4cac993949295d109804a8f7cc3a5b0a)

7 years agoOnly modify pixmap cache reply when protected by a mutex
Aaron Kennedy [Thu, 12 Aug 2010 02:38:53 +0000 (12:38 +1000)]
Only modify pixmap cache reply when protected by a mutex

QTBUG-12729
(cherry picked from commit ee7c3b576ced47d3b68da1913cdf6995144bddd2)

7 years agoDrawer widget in a MainWindow disappears after returning from full screen mode.
Carlos Manuel Duclos Vergara [Fri, 23 Jul 2010 15:03:42 +0000 (17:03 +0200)]
Drawer widget in a MainWindow disappears after returning from full screen mode.

The problem was in the toggleDrawer function. We were not checking the
status of the last transition before setting the new transition, so
all the transition were treated as non-intentional.

Task-number: QTBUG-11373
Reviewed-by: Prasanth
(cherry picked from commit 725d8e061ededee9a5ddf0914aabd0f6aa2ee741)

7 years agoModification of def files for non existing functions.
Toby Tomkins [Wed, 18 Aug 2010 03:52:04 +0000 (13:52 +1000)]
Modification of def files for non existing functions.

Task-number: QT-2027
Reviewed-by: Joona Petrell
7 years agoUpdate QtGui def files
Joona Petrell [Tue, 17 Aug 2010 03:29:08 +0000 (13:29 +1000)]
Update QtGui def files

Task-number:
Reviewed-by: Martin Jones
(cherry picked from commit 875d5e374dce3dd7d7cce87b55e277e8e9497044)

7 years agoUpdate QtDeclarative def files
Joona Petrell [Tue, 17 Aug 2010 03:29:08 +0000 (13:29 +1000)]
Update QtDeclarative def files

Task-number:
Reviewed-by: Martin Jones
(cherry picked from commit cf0f53ecefd6914d533ffea057748480e3e5bd33)

7 years agoFix check to remove unnecessary deployments in Symbian
Miikka Heikkinen [Fri, 13 Aug 2010 10:25:46 +0000 (13:25 +0300)]
Fix check to remove unnecessary deployments in Symbian

Previously check to remove files from deployment in case the deployment
target location was the same as the source location was done using
QFileInfo equality, which resolved to true when file didn't yet exist
at the time qmake was run. Changed the check to compare absolute paths
instead.

Task-number: QTBUG-12879
Reviewed-by: Shane Kearns
(cherry picked from commit 448a8603bb0609bf880a2c1b92b26c2005e1cf63)

7 years agoFix "installer_sis" and "deploy" targets when TARGET has path
Miikka Heikkinen [Fri, 13 Aug 2010 12:22:25 +0000 (15:22 +0300)]
Fix "installer_sis" and "deploy" targets when TARGET has path

Dependencies got generated wrong in Makefile because sis is always
created in the .pro file directory but dependency included path
that was in TARGET.

Task-number: QTBUG-12884
Reviewed-by: Shane Kearns
(cherry picked from commit 434ce6748ea7f082357b6d7ab542c9fa2285bd4c)

7 years agoFix QProcessManager destruction
Miikka Heikkinen [Mon, 16 Aug 2010 13:09:34 +0000 (16:09 +0300)]
Fix QProcessManager destruction

If QProcessManager destructor is ran as part of global static cleanup,
manager thread will most likely be terminated by kernel at that point,
so trying to delete QProcessActives and QProcessMediators will panic as
they will still be active. They can also no longer be properly canceled
as the thread is already gone. In case manager thread has already died,
which implies that process exit is imminent, we simply do nothing and
let the deletion of the main heap at process exit take care of stray
objects.

Task-number: QTBUG-11218
Reviewed-by: Janne Koskinen
(cherry picked from commit 7cfc9f2245162944f3d9a29ad73cd93e2bcf197f)

7 years agoqdoc: Added the fix to change qml-qml-file.name to qml-file.name
Martin Smith [Fri, 13 Aug 2010 12:01:49 +0000 (14:01 +0200)]
qdoc: Added the fix to change qml-qml-file.name to qml-file.name
(cherry picked from commit 13d35e19a2bf78dd6a63b35f06a07d2b6e9c67c4)

7 years agoCocoa: Stacking order of modal dialogs is wrong
Richard Moe Gustavsen [Fri, 13 Aug 2010 12:05:17 +0000 (14:05 +0200)]
Cocoa: Stacking order of modal dialogs is wrong

Modal dialogs were sometimes hidden behind other normal windows
on screen. The reason was that, upon going modal for a window, we
actually resat the stacking level on the window in a faulty
attempt to respect any stays-on-top window flags. This patch
makes sure we avoid doing that, and at the same time, ensures
we don't reintroduce the original bug as well.

Task-number: QTBUG-12841
Reviewed-by: cduclos
(cherry picked from commit 6d0d767e63df3c997d6d7a8cb6cd4bf8c0dfc835)

7 years agoMultiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa)
Prasanth Ullattil [Fri, 13 Aug 2010 10:27:55 +0000 (12:27 +0200)]
Multiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa)

Every time [NSApp setMainMenu:] is called, Cocoa will add the 'Special
Characters' item to the 'Edit' menu. Before adding a new entry it will
make sure that menu items list doesn't contain an item with the selector
'orderFrontCharacterPalette' & a 'nil' target. We need to return the
index for the first entry (we have QCocoaMenuLoader as target).

Task-number: QTBUG-12842
Reviewed-by: Denis
(cherry picked from commit b52da4ab2179079a6aff95891786d2f6598048b5)

7 years agoDoc: removed assistant style and reintroduced the index page icons.
Morten Engvoldsen [Fri, 13 Aug 2010 13:20:36 +0000 (15:20 +0200)]
Doc: removed assistant style and reintroduced the index page icons.
(cherry picked from commit 2dfd16e8a138da9d903b31ef461331016d16ec5b)

7 years agoqdoc: All references to -assistant and -base were removed.
Martin Smith [Thu, 12 Aug 2010 07:09:20 +0000 (09:09 +0200)]
qdoc: All references to -assistant and -base were removed.

Flags allowed are now -creator and -online. -creator is
the default.
(cherry picked from commit 03d9d3cf641c8dde22a903870ac2b6e58ada6eec)

7 years agoqdoc: added application flags in doc.pri and fixed QTBUG-12388
Martin Smith [Thu, 5 Aug 2010 12:56:50 +0000 (14:56 +0200)]
qdoc: added application flags in doc.pri and fixed QTBUG-12388

Task-nr: QTBUG-12388
(cherry picked from commit c1ce7b4b01c1049c61881bb7d701ed68b92a401b)