qt:kde-qt.git
7 years agoThis patch adds support for using -isystem to allow putting an include patches/0216-allow-isystem-for-headers
Benjamin Reed [Tue, 19 Feb 2008 16:37:37 +0000 (17:37 +0100)]
This patch adds support for using -isystem to allow putting an include
directory at the end of the compiler's header search path.

I don't have the exact output anymore (I've since patched Qt's configure) but
essentially, since I have pcre.h in /opt/kde4-deps/include, it was
conflicting with Qt's (modified) pcre.h in the WebKit bits, since
-I /opt/kde4-deps/include ends up in CXXFLAGS in the generated makefiles, it
comes *before* the specific locations in INCPATH on the compile line, and you
end up with a conflict with the system-installed pcre.h.

Presumably, if your pcre.h is in /usr/include as on most Linux systems, you
wouldn't notice this issue since /usr/include's already in your include path
and people likely don't pass -I /usr/include to configure.  I suspect that on
any platform with a regular, system-installed pcre.h (or clucene headers),
adding -I /usr/include would exhibit this bug, just as a custom-installed
pcre/clucene in another root would.

qt-bugs@ issue : 199610
Trolltech task ID :
bugs.kde.org number :

7 years agoMinor changelog updates v4.6.0
Jason McDonald [Fri, 27 Nov 2009 00:59:25 +0000 (10:59 +1000)]
Minor changelog updates

Reviewed-by: Olivier Goffart
(cherry picked from commit 19d0a365dd99dc1a108e58949f7d0f49bac72623)

7 years agoBackground in landscape mode on S60 5.0 is broken
Sami Merilä [Thu, 26 Nov 2009 11:50:29 +0000 (13:50 +0200)]
Background in landscape mode on S60 5.0 is broken

After initial fix, 99% of widgets draw temselves properly after
orientation switch. However, QScrollAreas lose their palette hash,
which causes scrollarea background to re-start from theme background
top-left.

As a correction, we re-set the theme palette hash after calling
QApplication::setPalette, since that clears palette hash.

Task-number: QTBUG-6125
Reviewed-by: Alessandro Portale
(cherry picked from commit 41f1276392444b9e46b30f3537a8a63af6fffc9d)

7 years agoFixing background painting after orientation switch.
Alessandro Portale [Wed, 25 Nov 2009 16:41:34 +0000 (17:41 +0100)]
Fixing background painting after orientation switch.

Fixing previous fixes of QS60StylePrivate::setBackgroundTexture with
commit SHAs a80e58335e69c8ce96d1596e0ed2d14e424a0d5e and
d4089399a3ab7548a864d5a399e08df85c444783
Now, the palette gets the updated background brush and the palette is
actually set as application palette.

Also making sure that QS60StylePrivate::handleDynamicLayoutVariantSwitch
does the right things in the right order. So that Table headers are not
broken after orientaion switch.

Task-number: QTBUG-6125
Task-number: QT-1478
Reviewed-by: Shane Kearns
(cherry picked from commit 89c537dbd1b4bfbfcb3a3e3644c093b5a6e85469)

7 years agoRevert "Fixes implicit grabbing in Qt/Cocoa"
Jason McDonald [Thu, 26 Nov 2009 02:21:23 +0000 (12:21 +1000)]
Revert "Fixes implicit grabbing in Qt/Cocoa"

This reverts commit 49360b3237363db2a8d6c6eeafb0aaa83d3efdc0.

7 years agoFix crash of QtWebKit on any page with Flash when compiled witn MinGW.
Jocelyn Turcotte [Wed, 25 Nov 2009 15:22:29 +0000 (16:22 +0100)]
Fix crash of QtWebKit on any page with Flash when compiled witn MinGW.

Early push of this fix which should be overwritten by the fix
upstreamed in WebKit trunk later.

Reviewed-by: Simon Hausmann
(cherry picked from commit dddd3e5fc9658ebbb5f94b343e7c7c0cd27eb7f2)
(cherry picked from commit 4c3539dfbc65d5decdd842d4181f9aa3d38d213c)

7 years agoDoc: Added the required legal notices.
David Boddie [Wed, 25 Nov 2009 15:19:49 +0000 (16:19 +0100)]
Doc: Added the required legal notices.

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

7 years agoOn Windows Flash is played only while moving mouse inside the plugin.
Prasanth Ullattil [Wed, 25 Nov 2009 12:56:00 +0000 (13:56 +0100)]
On Windows Flash is played only while moving mouse inside the plugin.

Qt is using the same window message as Flash plugin. We need to check
the window handle before we treat this as Qt internal message.

Reviewed-by: Bradley T. Hughes
(cherry picked from commit 48e56643f1b7daf7c255a1e58f0e213b06e15f65)
(cherry picked from commit 7b845236d8670bb9cb5884ea60f422d09dafd89c)

7 years agoFix compilation with Sun CC: no semi-colon after Q_PROPERTY
Thiago Macieira [Wed, 18 Nov 2009 12:47:48 +0000 (13:47 +0100)]
Fix compilation with Sun CC: no semi-colon after Q_PROPERTY

Reviewed-By: Peter Hartmann
(cherry picked from commit e6d6d3830e86202d4f32cd5695f37d4568710562)

7 years agoFixes implicit grabbing in Qt/Cocoa
Denis Dzyubenko [Mon, 23 Nov 2009 16:56:03 +0000 (17:56 +0100)]
Fixes implicit grabbing in Qt/Cocoa

When delivering mouse events in Qt/Cocoa set the implicit mouse grabber and
deliver the event to it and do not try to propagate the event to the parent
view.

Reviewed-by: Prasanth
(cherry picked from commit aae81f370f6afede95064bc75eb7ee6ac13b1c30)
(cherry picked from commit 106121a74bca32a6411b9ca968ee415f8bdfbff1)

7 years agoFix QFile::map in Linux 64bit
Olivier Goffart [Tue, 24 Nov 2009 08:34:48 +0000 (09:34 +0100)]
Fix QFile::map in Linux 64bit

On 64bit, qint64(size_t(-1)) = -1

Reviewed-by: Joao
Reviewed-by: Thiago
(cherry picked from commit 829d9e10ad3d26fb2fddef01c8e36352018c3fec)
(cherry picked from commit c71c46430317b70e784f0952d0aac048775ad842)

7 years agoFix links to docs in INSTALL and README
Jason McDonald [Wed, 25 Nov 2009 00:16:26 +0000 (10:16 +1000)]
Fix links to docs in INSTALL and README

The names of the doc directories on the doc site don't include the patch
version number.

Task-number: QTBUG-6043
Reviewed-by: Trust Me
(cherry picked from commit 80e9b7cdeeb1b1e85e724b4ed1903e0923005c79)

7 years agoFix softkeys for QDialogButtonBoxes created without a parent.
Jason Barron [Tue, 24 Nov 2009 14:52:38 +0000 (15:52 +0100)]
Fix softkeys for QDialogButtonBoxes created without a parent.

Inthe case where a QDialogButtonBox was created without a parent, for
example in the FTP example, the softkeys that are automatically created
inside the button box were not being added to the right widget when the
button box was given a parent (or added to a layout) later.

This patch resolves that issue by handling the ParentChange event and
then adding the softkeys at this point.

Task-number: QTBUG-6086
Reviewed-by: axis
(cherry picked from commit a0c8e134a284d45520dd3a229e68dbcd155299e6)

7 years agoRemoved drilldown from fluidlauncher demo.
axis [Tue, 17 Nov 2009 14:56:59 +0000 (15:56 +0100)]
Removed drilldown from fluidlauncher demo.

It has too many problems at the moment, like taking up too much space
and not being able to close the popup window.

RevBy:    Alessandro Portale
(cherry picked from commit 6ae54df86262a8128f15deb067dd1117a14e715e)

7 years agoAdded some missing build instructions for abld.
axis [Tue, 24 Nov 2009 13:36:08 +0000 (14:36 +0100)]
Added some missing build instructions for abld.

WebKit will not build unless the mentioned variable is set.

RevBy:    Aleksandar Sasha Babic
(cherry picked from commit 4817debee23a72f44eedbb8f33b6b611b5161174)

8 years agoCompile fix for win32-icc.
Jan-Arve Sæther [Mon, 23 Nov 2009 14:39:31 +0000 (15:39 +0100)]
Compile fix for win32-icc.

The Intel Compiler inlined the destructor of QObjectPrivate too
agressively, causing it to generate a call to ~QObjectData for QtGui.
~QObjectData is not exported from QtCore, so it failed linking.

Task-number: QTBUG-5145
Reviewed-by: Alexis Menard
(cherry picked from commit db5e4496229a776768464d1d3d2e1f8e81bd6ba0)

8 years agoDon't crash in eval() function when QtScript debugger is attached
Kent Hansen [Mon, 23 Nov 2009 14:26:36 +0000 (15:26 +0100)]
Don't crash in eval() function when QtScript debugger is attached

The built-in eval() function bypasses the script registration
performed by QScriptEngine::evaluate(), so if we get an
atStatement() callback from JSC from that script, the
scriptID-to-sourceProvider lookup will fail.

In this case, just return from atStatement() without delivering
the positionChange() callback to the QScriptEngineAgent, since
the agent will not have received the scriptLoad() callback for
that script anyway.

This is a change in behavior from 4.5, but we consider it
the minimum-impact fix at this point to keep 4.6.0 from
crashing. The only downside is that debugging will
effectively be "disabled" for the script passed to eval(),
but that's a lot better than crashing.

Task-number: QTBUG-6108
Reviewed-by: Jedrzej Nowacki
(cherry picked from commit 23002374d11598b26b6585e78dc073071a13f0ec)

8 years agoWinCE: only use native menu bars for windows mobile
ninerider [Mon, 23 Nov 2009 12:09:56 +0000 (13:09 +0100)]
WinCE: only use native menu bars for windows mobile

On Windows CE the native menubar must not be used.
The corresponding flag was never set for Windows CE.

Task-number: QT-2530
Reviewed-by: Maurice
(cherry picked from commit cda63c368dbb5acd040e2190db8f25de69462d8e)

8 years agoRevert check for file size to a warning in QFile::map
João Abecasis [Thu, 19 Nov 2009 16:15:03 +0000 (17:15 +0100)]
Revert check for file size to a warning in QFile::map

The check, introduced in c66de8a19b558e14097c402480eeabf0b5ec2351,
changes behavior and it is not clear whether we should prevent
mmaping beyond EOF. FWIW, python prevents it.

Leaving a warning in there for now so as not to break applications that
depend on the feature.

Task-number: QTBUG-6008
Reviewed-by: Thiago Macieira
(cherry picked from commit 095c92f03e0c01b878eaa0cd1b7844171ce9241f)

8 years agoFix regression introduced in 1e6b424b692b20dcfec920f8d3563e520ec1ff05
João Abecasis [Fri, 20 Nov 2009 12:50:41 +0000 (13:50 +0100)]
Fix regression introduced in 1e6b424b692b20dcfec920f8d3563e520ec1ff05

When processing the result of QIODevice::readLine, forgot to take into
account that a '\0' is appended to the array. The terminating character
is not accounted for in the number of bytes returned.

By pre-allocating a byte for the terminating null character, we make
sure we'll actually read 16k bytes on each and every iteration.

Task-number: QTBUG-6019
Reviewed-by: Thiago Macieira
(cherry picked from commit b7692016f282251002b3e85dfcb5567bd91a12c0)

8 years agoFixed antialiasing in the GL based QGraphicsView demos under X11.
Trond Kjernåsen [Fri, 20 Nov 2009 11:24:06 +0000 (12:24 +0100)]
Fixed antialiasing in the GL based QGraphicsView demos under X11.

All the examples/demos that used a QGraphicsView with a QGLWidget
as a viewport, that had multisampling enabled, was broken after
7b61fbf03e170a7da37d5f57ed4053aae719ec7f. This is because the reparented
QGLWidget will be forced to use the parent widget's visual, which in this
case does not contain any multisample buffers. The QX11Info structure
for QGLWidget is put together based on the QGLFormat that is passed
into the QGLWidget constructor and will in most cases always be
different from the parent widget visual.

Task-number: QTBUG-5998 and QTBUG-6003
Reviewed-by: Eskil
(cherry picked from commit 5cf6f6276a3a9103876937c300c1adce157eebeb)

8 years agoDocument known issue - window resizing slower on Windows 7 due to gesture
Volker Hilsheimer [Thu, 19 Nov 2009 16:04:01 +0000 (17:04 +0100)]
Document known issue - window resizing slower on Windows 7 due to gesture
initialization process creating window handles.
(cherry picked from commit b752acf1805eebd64e7e833862690e9ebdb714e3)

8 years agodoc: Added note about including a 3rd party library in the bundle.
Martin Smith [Thu, 19 Nov 2009 14:24:40 +0000 (15:24 +0100)]
doc: Added note about including a 3rd party library in the bundle.
(cherry picked from commit 51b3c2e652578f5577c07c22e177699d345c1dd7)

8 years agoIncorrect DropAction returned by QDrag::exec() on Cocoa.
Prasanth Ullattil [Fri, 20 Nov 2009 10:51:55 +0000 (11:51 +0100)]
Incorrect DropAction returned by QDrag::exec() on Cocoa.

The action performed by the latest drag and drop operation is stored in
the global DnDParams structure. The QDrag::exec() return value has to be
fetcted from this global variable instead of the temporary copy on stack.
Commit 0d231c32cc7670d356d486b13648cb5bd471ffef broke this.

Task-number: QTBUG-6001
Reviewed-by: Denis
(cherry picked from commit a222302ca45e33306dacae0aa16a572c13abc483)

8 years agoQ_ASSERT failure when resizing a span to (1,1) in 1st cell
Gabriel de Dietrich [Fri, 20 Nov 2009 12:40:34 +0000 (13:40 +0100)]
Q_ASSERT failure when resizing a span to (1,1) in 1st cell

Reviewed-by: Olivier
Task-number: QTBUG-6004
(cherry picked from commit 75d68b2b245da91ec9f985893f9b233d9d6a0793)

8 years agoFix configure warning for non-symbian builds
Jason McDonald [Mon, 23 Nov 2009 04:00:05 +0000 (14:00 +1000)]
Fix configure warning for non-symbian builds

Configure complains about "Could not retrieve
HKEY_LOCAL_MACHINE\Software\Symbian\EPOC SDKs setting".  It should only
try to do that for Symbian builds.

Reviewed-by: Lincoln Ramsay
(cherry picked from commit 7e7e3c3fe15780aa7d024e136acaf697ab49458c)

8 years agoDoc: Adding documentation on Embedded Hardware acceleration
Morten Engvoldsen [Thu, 19 Nov 2009 13:32:27 +0000 (14:32 +0100)]
Doc: Adding documentation on Embedded Hardware acceleration
Added "best practice" page on HW acc for mebedded. Modified HW acc docs. Adding Hello GL ES for Wince to the list of examples.

QTBUG-5791
David Boddie
(cherry picked from commit fbbdf8698fb0444d5170b7d0a14e870ea789398f)

8 years agofix crash on closing "rightmost" file
Oswald Buddenhagen [Fri, 20 Nov 2009 20:07:04 +0000 (21:07 +0100)]
fix crash on closing "rightmost" file

"This cannot happen" ... yeah, right. :}

Task-number: QTBUG-5989
(cherry picked from commit 7367a12c4a0d7686b9d35778e5de33a463504d75)

8 years agoFixes regression in QListView: Selection would not expend to the full viewport
Olivier Goffart [Thu, 19 Nov 2009 15:24:10 +0000 (16:24 +0100)]
Fixes regression in QListView: Selection would not expend to the full viewport

Commit ecc202c introduced the regression while fixing another
regression (QTBUG-5854)

The selection would not expend to the whole viewport.

Reviewed-by: Robert Griebl
(cherry picked from commit 73153fa5288e22d27f26d0e1045e82698c9a6343)

8 years agoUse relative paths when invoking mifconv.
Janne Anttila [Thu, 19 Nov 2009 12:25:59 +0000 (14:25 +0200)]
Use relative paths when invoking mifconv.

Some S60 SDK has a bug which make mifconv to crash with absolute paths.
Switched to use QMAKE_FILE_IN variable in mifconv.commands instead of
using join of ICON keywords. Joining is not needed anymore since ICON
keyword supports only one filename. Using input variable
(QMAKE_FILE_IN) also esnures that absolute path is converted to
relative before invoking mifconv.

Task-number:  QTBUG-4745
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 745db3d1b9a149910dcaa3c65aabab020eefa027)

8 years agoUnified ICON keyword handling for ABLD and SBSv2 toolchains.
Janne Anttila [Thu, 19 Nov 2009 12:09:50 +0000 (14:09 +0200)]
Unified ICON keyword handling for ABLD and SBSv2 toolchains.

With SBSv2 toolchain only first file from ICON keyword is used and
it is actually the right behaviour. Originally support for multiple
files in ICON keyword was introduced to support localized application
icons. However, in that case the different localized icons should not
go to same MIF file since it is not possible to define in .rss file
which icon number should be used for which language.

To support a localized application icons separate MIF for each locale
should be created and installation of ICON should depend on selected
language. Implementing proper support for localized icons is left
for another task.

Task-number: QTBUG-4745
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 6c6661041fa3dfe7a8915ee1d27443b2ced179de)

8 years agoEnabled Qt icon in Symbian also for demos/examples without UID3.
Janne Anttila [Thu, 19 Nov 2009 14:02:36 +0000 (16:02 +0200)]
Enabled Qt icon in Symbian also for demos/examples without UID3.

ICON keyword can be used without UID, since .mif filename
is generated based on target instead of UID3 nowadays

Task-number: QTBUG-4677
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 05e956d5c7d5c39bee332972ce54fea71c15d24b)

8 years agoAdded default Qt icon back for Qt demos/examples in Symbian.
Janne Anttila [Thu, 19 Nov 2009 13:07:29 +0000 (15:07 +0200)]
Added default Qt icon back for Qt demos/examples in Symbian.

This commit basically reverts fa35247d31bd35d72c307f4a6a231400aade0c0.
It can be reverted now since mifconv invoking is changed to use
relative paths instead of absolute one.

Task-number: QTBUG-4745
Reviewed-by: TrustMe
(cherry picked from commit 4e4a800574a28a441858f95021d9092aa3001491)

8 years agoChanged MIF filename from UID to target name in Symbian.
Janne Anttila [Wed, 18 Nov 2009 12:47:42 +0000 (14:47 +0200)]
Changed MIF filename from UID to target name in Symbian.

This change makes it possible to define ICON keyword in pro file
without UID3.

It is safe to use target as an icon name since Symbian devices cannot
have two different binaries with the same name as all binaries are
located in \sys\bin. This means there cannot be also two mif files
with same target name. Also all native S60 apps use target name as an
MIF basename. Target name is also much easier to associate with app
than UID.

Task-number: QTBUG-4677
Reviewed-by: Miikka Heikkinen
(cherry picked from commit 952f0ca3f371b040bd8b8a007cdf87bf0e4843ad)

8 years agoDo not recreate the VGImage if the size is unchanged
Rhys Weatherley [Fri, 20 Nov 2009 06:32:35 +0000 (16:32 +1000)]
Do not recreate the VGImage if the size is unchanged

When a pixmap's contents change in QVGPixmapData, only recreate
the VGImage in the GPU if the size is different than before.
This should help reduce GPU memory fragmentation.

Task-number: QT-2504
Reviewed-by: Sarah Smith
(cherry picked from commit a8c8c2274d2d0a708786adbb357013955f99c0af)

8 years agoRemove unmatched else in non-EGL mode for OpenVG pixmap data
Rhys Weatherley [Fri, 20 Nov 2009 05:11:17 +0000 (15:11 +1000)]
Remove unmatched else in non-EGL mode for OpenVG pixmap data

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

8 years agoPrevent a deep copy of QImage::bits() in the OpenVG pixmap implementation
Rhys Weatherley [Fri, 20 Nov 2009 00:22:17 +0000 (10:22 +1000)]
Prevent a deep copy of QImage::bits() in the OpenVG pixmap implementation

Task-number: QTBUG-5869
Reviewed-by: Sarah Smith
(cherry picked from commit 73477789bdeeba851cf095cbdda5c36d9f5c31df)

8 years agoAdd entry about behavior changes due to QtScript using JavaScriptCore
Kent Hansen [Thu, 19 Nov 2009 08:48:49 +0000 (09:48 +0100)]
Add entry about behavior changes due to QtScript using JavaScriptCore
(cherry picked from commit 9590574158d0d976f66c9f7ca36f88b2f28d52b9)

8 years agoAutotest: Change the service name we're testing between tests.
Thiago Macieira [Thu, 19 Nov 2009 10:45:32 +0000 (11:45 +0100)]
Autotest: Change the service name we're testing between tests.

Otherwise, we get errors from one test to the next, due to the cleanup
unregistering the name again.

Task-number: QT-5588
(cherry picked from commit 65e00180516eb136c2a7119dfe9e63fc9c66065e)

8 years agoRemember to match the actual arguments too.
Thiago Macieira [Thu, 19 Nov 2009 09:48:01 +0000 (10:48 +0100)]
Remember to match the actual arguments too.
(cherry picked from commit b1196d5733ae01660e4345a5bbecd9c1b32238a4)

8 years agoDisable the deprecation warning for this signal since we're using it now
Thiago Macieira [Thu, 19 Nov 2009 09:04:16 +0000 (10:04 +0100)]
Disable the deprecation warning for this signal since we're using it now

Task-number: QTBUG-5972
(cherry picked from commit f01c631f84f9373b06d0572bfed7a4e8213a46a7)

8 years agoRevert "Stop using the NameOwnerChanged signal without arg0 in QtDBus itself"
Thiago Macieira [Thu, 19 Nov 2009 09:01:47 +0000 (10:01 +0100)]
Revert "Stop using the NameOwnerChanged signal without arg0 in QtDBus itself"

This partially reverts commit 1176ecf0b533279e5a1c97f183e5c5f1c57fb188.

Task-number: QTBUG-5972
(cherry picked from commit db1cff73726ff12d50139769dc8071f9e9173261)

8 years agoupdated configure.exe - should fix the Symbian and WinCE issues
Espen Riskedal [Fri, 20 Nov 2009 12:11:01 +0000 (13:11 +0100)]
updated configure.exe - should fix the Symbian and WinCE issues

Reviewed-by: Shane Kearns
8 years agoUpdate .qm files for release
Jason McDonald [Fri, 20 Nov 2009 04:14:21 +0000 (14:14 +1000)]
Update .qm files for release

Acked-by: Oswald Buddenhagen
8 years agoRevert "Doc: Added an example to demonstrate the QWebElement class."
Jason McDonald [Fri, 20 Nov 2009 03:30:07 +0000 (13:30 +1000)]
Revert "Doc: Added an example to demonstrate the QWebElement class."

This reverts commit 19d63f4d932ae16d0e1c69892681ecd1fabeb44c.

Conflicts:

doc/src/qt4-intro.qdoc

8 years agoremove bogus doc paragraphs relating to codecForUtfText()
Oswald Buddenhagen [Tue, 17 Nov 2009 19:31:42 +0000 (20:31 +0100)]
remove bogus doc paragraphs relating to codecForUtfText()

these aren't *strictly* bogus, but rather confusing. the real issue is
that the functions would get confused by something which looks like a
BOM, but isn't, and there is nothing one could do about it.

Reviewed-by: Volker Hilsheimer
(cherry picked from commit bb4e301ce6762ab300618c579bd65ea1ee17dc2d)

8 years agoImproved documentation Qt for the Symbian platform
Alessandro Portale [Thu, 19 Nov 2009 19:33:01 +0000 (20:33 +0100)]
Improved documentation Qt for the Symbian platform

By Janne Anttila:
- Switched links/references from 'S60' to 'Symbian'
- Added collection page for Symbian specific documentation
- Added page about application deployment for Symbian
- Update supported compiler list for Symbian to more specific one
- Added bullet about dev env. setup to Symbian installation page
- Commented that SBSv2 is not offically supported by current S60 SDKs
- Moved S60 3rd FP1 special patching note after SDK installation bullet
- Recommedation to look into Qt quick start guide from Symbian Forum
- Added Symbian bullet to known issues page and link to wiki
- Added link to "state of support" document from symbian docs main page

By aportale:
- Rephrasing
- More consistent naming of 'Qt for the Symbian platform'
- Implementation of suggestions from other Nokians

Reviewed-By: Janne Anttila
(cherry picked from commit ea0f526ac3a7daef5d4ebff2373a01d4088e28c3)

8 years agodoc: Fixed qdoc according to Bjarne's recommendation.
Martin Smith [Mon, 16 Nov 2009 12:43:15 +0000 (13:43 +0100)]
doc: Fixed qdoc according to Bjarne's recommendation.

Someone had changed an operator==() and an operator!=() from
single parameter members to two-parameter friends but hadn't
changed the qdoc comments.
(cherry picked from commit d65bff4c94fb11bbad02420459a9375621051823)

8 years agoDoc: Add link to the Symbian Introduction.
Volker Hilsheimer [Fri, 13 Nov 2009 13:30:08 +0000 (14:30 +0100)]
Doc: Add link to the Symbian Introduction.
(cherry picked from commit 87e7b96ccf3385dcfff079a69a4c6e45f8b5bc52)

8 years agoDoc: Added an example to demonstrate the QWebElement class.
David Boddie [Mon, 9 Nov 2009 18:38:35 +0000 (19:38 +0100)]
Doc: Added an example to demonstrate the QWebElement class.

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

8 years agoFix for compile error in Phonon MMF backend
Gareth Stockwell [Thu, 19 Nov 2009 17:21:22 +0000 (17:21 +0000)]
Fix for compile error in Phonon MMF backend

This was introduced by d0b0b525de.

The use of QT_NO_DEBUG macros causes release-armv5 builds to fail
when the -release option is passed to configure.

This change causes the debugging code (ObjectDump and related
classes) to be included in release builds, although these functions
are not executed.

This is a temporary fix; task QTBUG-6012 has been created for
re-removing this code from release builds.

Reviewed-by: Frans Englich
(cherry picked from commit f3118df6af745759a73d8a9f40d1fa1a90a4385a)

8 years agoFix configure's accepting of old license keys (pre 4.6)
Thiago Macieira [Thu, 19 Nov 2009 18:36:23 +0000 (19:36 +0100)]
Fix configure's accepting of old license keys (pre 4.6)

Reviewed-by: Peter Hartmann
(cherry picked from commit 041f7fc92959d4aefa88fca7a6f5d153faf4aa0a)

8 years agofix accepting of old license keys (pre 4.6)
Peter Hartmann [Thu, 19 Nov 2009 18:25:06 +0000 (19:25 +0100)]
fix accepting of old license keys (pre 4.6)

Reviewed-by: Thiago Macieira
(cherry picked from commit 9e75354eabbc3c58472ed0c3dc9cba831827c38a)

8 years agoFreeze def files against 4.6.0
Shane Kearns [Thu, 19 Nov 2009 16:12:13 +0000 (17:12 +0100)]
Freeze def files against 4.6.0

Reviewed-By: Trust Me
(cherry picked from commit 1f6aa19209a7d22bb15bf0a0afb2d62200c0d3fa)
(cherry picked from commit 2a444790abd05de2dd5aa546ad1745f911f2a73c)

8 years agoDoc: List planned changes to platform support in Qt 4.7
Volker Hilsheimer [Fri, 13 Nov 2009 13:45:28 +0000 (14:45 +0100)]
Doc: List planned changes to platform support in Qt 4.7
(cherry picked from commit d5a92bdd3f0f355a05b8f6ceac577f0c12c3bd5d)

8 years agoUse a lowercase name for the binary of the Form Extractor example
Benjamin Poulain [Thu, 19 Nov 2009 15:47:12 +0000 (16:47 +0100)]
Use a lowercase name for the binary of the Form Extractor example

The name of the other examples are lowercase. The XML file of Qt Demo
reference a lowercase name.

Reviewed-by: Olivier Goffart
(cherry picked from commit 34044853d4315309920a481a585f96ba7b3fb140)

8 years agoSimply adds the Frozen Column example to qtDemo
Pierre Rossi [Thu, 19 Nov 2009 15:45:42 +0000 (16:45 +0100)]
Simply adds the Frozen Column example to qtDemo

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

8 years agofancybrowser example: make sure that images are rotated for loaded pages
Jocelyn Turcotte [Tue, 17 Nov 2009 12:14:49 +0000 (13:14 +0100)]
fancybrowser example: make sure that images are rotated for loaded pages

See QTBUG-5532.

Reviewed-by: Jedrzej Nowacki
(cherry picked from commit 9f5dea393da4428685f1a1fd26b0e27f90dca340)

8 years agoSymbian docs: Repair some documentation damage, remove obsolete file.
Frans Englich [Thu, 19 Nov 2009 13:23:56 +0000 (14:23 +0100)]
Symbian docs: Repair some documentation damage, remove obsolete file.

Reviewed-by: TrustMe
Conflicts:

doc/src/platforms/symbian-support.qdoc

Something went wrong with the cherry-picks, spotted by Jason.
Conflicting cherry-pick of 9a4995711746103286ea3fb9cc576e133fd29e4e.
(cherry picked from commit 865409a01af971411c0b68a171d5b4c0242cf0a1)

8 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 7bdf90...
Simon Hausmann [Wed, 18 Nov 2009 14:32:15 +0000 (15:32 +0100)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 7bdf90f753d25fb1b5628b0980827df11110ad5a )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2009-11-18  Paul Olav Tvete  <paul.tvete@nokia.com>

        Reviewed by Simon Hausmann.

        [Qt] Make the QWebElement::render() test pass when pixmaps aren't 32 bit.

        * tests/qwebelement/tst_qwebelement.cpp:
        (tst_QWebElement::render):

2009-11-18  Simon Hausmann  <simon.hausmann@nokia.com>

        Reviewed by Tor Arne Vestbø.

        Clarify and simplify the legal section in the overview documentation,
        after review with our legal team.

        * docs/qtwebkit.qdoc:

2009-11-18  Simon Hausmann  <simon.hausmann@nokia.com>

        Reviewed and suggested by Tor Arne Vestbø.

        Fix the autotest after commit ecbb2c0dd21bfc197e1f7b53150ec9b1a1d8cb8f
        to compare the Qt::ImFont property's family against an explicitly
        previously configured family.

        * tests/qwebpage/tst_qwebpage.cpp:
        (tst_QWebPage::inputMethods):
(cherry picked from commit 1ca2903b81c77573d37c5bd486b8d8e49a87ffc1)

8 years agoFix build breakage in 1b14c3d33dea0fe4814f2749c49cf916ca13e012
Jason McDonald [Thu, 19 Nov 2009 13:35:40 +0000 (23:35 +1000)]
Fix build breakage in 1b14c3d33dea0fe4814f2749c49cf916ca13e012

Reviewed-by: Bradley T. Hughes
(cherry picked from commit bf01b2fada207ee171224386771445487054d42b)

8 years agodoc: Added a further note about what the MinGW package is needed for.
Martin Smith [Wed, 18 Nov 2009 09:13:19 +0000 (10:13 +0100)]
doc: Added a further note about what the MinGW package is needed for.

Task-number: QTBUG-5764
(cherry picked from commit 422ed1c94869e4a93a14602beef69f5b08941060)

8 years agodoc: Added note about which MinGW package to use and where to get it.
Martin Smith [Wed, 18 Nov 2009 09:08:04 +0000 (10:08 +0100)]
doc: Added note about which MinGW package to use and where to get it.

Task-number: QTBUG-5764
(cherry picked from commit 11f192c2bc15b468379032f329d8805aac4a0886)

8 years agoCompile with mixed carbon/cocoa universal builds.
Morten Johan Sørvig [Wed, 18 Nov 2009 13:02:53 +0000 (14:02 +0100)]
Compile with mixed carbon/cocoa universal builds.

Moc got confused when Q3FileDialog was there
in the carbon build but not in the cocoa build.
(QT_MAC_USE_COCOA is defined by macros which moc
does not evaluate)

Fix this by porting Q3FileDialog to cocoa by using
the compat functions in QFileDialog.

revby:Prasanth Ullattil
(cherry picked from commit e59d974ddf2f2a413611ba4d8594c6413499a645)

8 years agoExport QStateMachine::WrappedEvent and QStateMachine::SignalEvent
Eskil Abrahamsen Blomfeldt [Wed, 18 Nov 2009 09:42:21 +0000 (10:42 +0100)]
Export QStateMachine::WrappedEvent and QStateMachine::SignalEvent

These two classes were missing exports. Since the accessors are inline,
the bug would only be visible when someone tried to call the
constructors of the classes.

Reviewed-by: Kent Hansen
(cherry picked from commit c7135e9b8d76e50daaa38d5d163687357878dc24)

8 years agoconfigure.exe: fix when configured with -openssl-linked
Jason McDonald [Thu, 19 Nov 2009 12:53:23 +0000 (22:53 +1000)]
configure.exe: fix when configured with -openssl-linked

before, when configured with -openssl-linked, configure.exe hang,
because of the following:
We were checking for XQMAKESPEC via something like
'dictionary["XQMAKESPEC"] == "someValue"' , which added the XQMAKESPEC
value to the dictionary. Later (line 3030), we checked whether
XQMAKESPEC was set (which was now true), and we used the value although
it was empty.

Reviewed-by: Thiago Macieira
Reviewed-by: Denis Dzyubenko
(cherry picked from commit 009f01107fd062c1cd478fc9dbf20d927ff9c459)

Conflicts:

configure.exe

8 years agoFix the evaluation nag in binary installs with commercial licenses.
Thiago Macieira [Wed, 18 Nov 2009 18:59:44 +0000 (19:59 +0100)]
Fix the evaluation nag in binary installs with commercial licenses.

It wasn't generating any message, but it did think it was an
evaluation install. So all Qt console applications produced an extra
newline and the GUI ones showed the Qt logo briefly.

I noticed because of the extra newline when building Qt itself.

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

8 years agoDoc: Remove stale notes about (lack of) ECMA compliance
Kent Hansen [Wed, 18 Nov 2009 17:42:58 +0000 (18:42 +0100)]
Doc: Remove stale notes about (lack of) ECMA compliance

QtScript now uses JavaScriptCore, where dates and regular
expressions are implemented in an ECMA compliant way.
(cherry picked from commit 5f1c10a15374e84e96e9e69e47f511acd3a71c4f)

8 years agoDoc: Add link to "Making Applications Scriptable" from QtScript module page
Kent Hansen [Wed, 18 Nov 2009 14:47:25 +0000 (15:47 +0100)]
Doc: Add link to "Making Applications Scriptable" from QtScript module page

Make the information easier to find. There are many places that
refer to the QtScript module page for more information, but after
the documentation was recently restructured, all that information
now resides on the "Making Applications Scriptable" page.
This issue was also reported on the qt4-preview-feedback mailing
list.

Reviewed-by: David Boddie
(cherry picked from commit 22ba574eef8c9412b63efb1126e2f432367c7061)

8 years agoApplication object must be constructed before QScriptEngine
Kent Hansen [Wed, 18 Nov 2009 13:54:10 +0000 (14:54 +0100)]
Application object must be constructed before QScriptEngine

This is required due to the switch to the JavaScriptCore-based
back-end.
Instead of segfaulting somewhere inside JSC::initializeThreading(),
call qFatal() when this constraint has been violated.

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

8 years agoremove unneeded JavaScriptCore.pro
Kent Hansen [Wed, 18 Nov 2009 11:07:15 +0000 (12:07 +0100)]
remove unneeded JavaScriptCore.pro

The file was erroneously imported from WebKit trunk.
It is not used when building QtScript, and the only practical
effect it has is to cause configure to spit out a warning.

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

8 years agoFix QCombobox painting regression on Windows
Olivier Goffart [Thu, 19 Nov 2009 11:22:17 +0000 (12:22 +0100)]
Fix QCombobox painting regression on Windows

Some style relies on this broken behaviour that was fixed in commit
e1a81c96790bee72ee4fbd2b0c4a7b48078c4ec1

The text on the combobox uses the wrong palette role.

Reviewed-by: jbache
(cherry picked from commit a1e1867ae3cac6b54cd06e9fc0ad1aa0b476fe9d)

8 years agorebuilt configure.exe
Jason McDonald [Thu, 19 Nov 2009 12:31:21 +0000 (22:31 +1000)]
rebuilt configure.exe

there were several changes made to configure.exe recently, this commit
makes sure we have rebuilt the binary after all the changes have been
made.

Reviewed-by: Thiago Macieira
(cherry picked from commit 16b41fec1b2bdd5cc5c849148464739925cbdfe6)

Conflicts:

configure.exe

8 years agoFixed a few license checks in configure.exe.
axis [Wed, 18 Nov 2009 16:02:50 +0000 (17:02 +0100)]
Fixed a few license checks in configure.exe.

Needs recompile.

Reviewed-By: Thiago Macieira
(cherry picked from commit de8b7a4e69b0c5bb5504fd0930cde290984b0cc7)

8 years agoconfigure.exe: Update to the new licensing structure.
Thiago Macieira [Tue, 17 Nov 2009 19:13:04 +0000 (20:13 +0100)]
configure.exe: Update to the new licensing structure.

Add support for Symbian commercial licenses and adapt to the
possibility from the RT operating systems

Task-number: QT-2518
Reviewed-by: axis
(cherry picked from commit d1779085462e7050a32e2f785767b4ce0d0cbfe0)

8 years agoConfigure: add support for the RTOS licensing scheme
Thiago Macieira [Tue, 17 Nov 2009 17:38:24 +0000 (18:38 +0100)]
Configure: add support for the RTOS licensing scheme

When building for one of the RTOS, require a specific license key.

Task-number: QT-2519
Reviewed-by: Jason McDonald
(cherry picked from commit 62e1db5793f9395e39091757135f4d96e564e6c2)

8 years agoConfigure: add support for the new licensing schemes for Qt.
Thiago Macieira [Tue, 17 Nov 2009 17:24:43 +0000 (18:24 +0100)]
Configure: add support for the new licensing schemes for Qt.

Add the necessary logic to deal with Symbian and the Real-Time
operating systems (QNX and VxWorks). Symbian is considered an embedded
license, so it allows a no-deploy build on X11 and Mac.

Task-number: QT-2519
Reviewed-by: Jason McDonald
(cherry picked from commit 21bb070cb979f3b581d829d153794ef97427155f)

8 years agoIncorporate feedback by Espen.
Frans Englich [Tue, 17 Nov 2009 16:19:52 +0000 (17:19 +0100)]
Incorporate feedback by Espen.

Reviewed-by: Espen Riskedal
(cherry picked from commit fb5361e27e2c48d52c2fe26fc48f8ef1438755f5)

8 years agoFix typo.
Frans Englich [Tue, 17 Nov 2009 12:04:17 +0000 (13:04 +0100)]
Fix typo.

Reviewed-by: TrustMe
(cherry picked from commit 97143d9c719951b85964a31c5e19bfeaddce9bae)

8 years agoDocument the state of support in Symbian.
Frans Englich [Mon, 16 Nov 2009 15:47:10 +0000 (16:47 +0100)]
Document the state of support in Symbian.

The content was compiled primarily by asking the members of the S60
team.

Reviewed-by: David Boddie
(cherry picked from commit 53112dfd0b20abcf0448fbc25728f8b8534ba81b)

8 years agoRemove examples/effects/customshader which uses private API
Jason McDonald [Thu, 19 Nov 2009 11:50:48 +0000 (21:50 +1000)]
Remove examples/effects/customshader which uses private API

Commit 3f109fd85cbdc49dc3ef1c14066073079f4e34bf made
QGraphicsShaderEffect private API, however the example showing how to
use it was kept. This patch just removes that example.

Reviewed-by: Samuel
(cherry picked from commit 1b14c3d33dea0fe4814f2749c49cf916ca13e012)

Conflicts:

examples/effects/customshader/blureffect.cpp
examples/effects/customshader/blureffect.h
examples/effects/customshader/blurpicker.cpp
examples/effects/customshader/blurpicker.h
examples/effects/customshader/customshadereffect.cpp
examples/effects/customshader/customshadereffect.h
examples/effects/customshader/main.cpp

8 years agoLineEdit graphics are sometimes missing from webpages with s60style
Sami Merilä [Tue, 17 Nov 2009 11:02:42 +0000 (13:02 +0200)]
LineEdit graphics are sometimes missing from webpages with s60style

If the webpage does define BODY colors for background, it is possible
that lineEdits are not drawn at all. Actually, they are drawn but with
transparent background, which makes them near-invisible. This is due
to that QS60Style tries to check if the themePalette has been changed
and if it has forwards the drawing of that particular widget to common
style. Common style unfortunately uses active style's palette to draw
the widget. S60Style defines Base to be transparent (to get the
theme background shine through) and common style tries to use Base
to draw lineEdit. End result is transparent lineEdit on webpage.

This fix makes more educated deduction when it tries to see if style
has been changed. This is related to QTBUG-4885.

Task-number: QTBUG-4885
Reviewed-by: Janne Koskinen
(cherry picked from commit 75ebdd04f41dd75be1e046a1c54ced0bfb78a0f2)

8 years agoMake the layout not grow in filndfiles example whne one clicks find
Thierry Bastian [Wed, 18 Nov 2009 15:04:05 +0000 (16:04 +0100)]
Make the layout not grow in filndfiles example whne one clicks find

Task-number: QTBUG-5528
Reviewed-by: Gabriel
(cherry picked from commit f7a030d62ef9fc7725716951b87ec52f6a0d4c2e)

8 years agoCrash when rendering a scene using DeviceCoordinateCache
Gabriel de Dietrich [Wed, 18 Nov 2009 11:21:08 +0000 (12:21 +0100)]
Crash when rendering a scene using DeviceCoordinateCache

The execution flow would allow the widget the scene would be rendered on to be
null. However this very widget was being used when using DeviceCoordinateCache
to get the desktop size. We now skip this optimisation when no widget is
given. Auto-test included.

Reviewed-by: bnilsen
Task-number: QTBUG-5904
(cherry picked from commit b6070e9a069219e4049fcf017d6a160b80bf37b7)

8 years agoFix tst_QGraphicsView::inputMethodSensitivity autotest
Olivier Goffart [Mon, 16 Nov 2009 14:54:38 +0000 (15:54 +0100)]
Fix tst_QGraphicsView::inputMethodSensitivity autotest

The problem was that the scene was not notified it lost the focus
when it was disconnected from the view (with setScene)
So when it got back the focus, nothing was updated because the
scene thought it still had the focus.

Reviewed-by: jasplin
(cherry picked from commit c535df0f286826c5575ec00c7e4c3f811a73918b)

8 years agoFixed Multi-length strings not implemented for float functions
Olivier Goffart [Thu, 19 Nov 2009 10:32:48 +0000 (11:32 +0100)]
Fixed Multi-length strings not implemented for float functions

Task-number: QTBUG-5963
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Eskil
(cherry picked from commit a73e660fd05bafc402d63d71e811a621e46f452d)

8 years agoRevert "Fix detection of linux-g++"
Paul Olav Tvete [Thu, 19 Nov 2009 10:26:44 +0000 (11:26 +0100)]
Revert "Fix detection of linux-g++"

This reverts commit 333bd2e761af8aaf6efd3d66eb028af046c4dfc2.
The change broke compilation of QWS, since QtGui depends on glib,
but doesn't link with it directly. This needs to be fixed properly,
but not just before the release.

Reviewed-by: Harald Fernengel
(cherry picked from commit baab5f7e77c1216ede839766c97abef1a708b365)

8 years agodoc: Removed google search engine.
Martin Smith [Thu, 19 Nov 2009 10:43:07 +0000 (11:43 +0100)]
doc: Removed google search engine.

The google search engine for the doc tree must
be generated after the doc tree has been built.
The google search engine for the doc tree should
only appear in the online docs.
(cherry picked from commit 8c6edd82358a37bf906e3994eea069a3b93e85fc)

8 years agoFixed compilation on AIX 6.1 with xlC 10.1
Samuel Rødal [Thu, 5 Nov 2009 12:10:19 +0000 (13:10 +0100)]
Fixed compilation on AIX 6.1 with xlC 10.1

Task-number: QTBUG-3368
Reviewed-by: Thiago Macieira
(cherry picked from commit 223b5de63e56c6c3dfbc5000b460baa653ab3f75)

8 years agoUpdate license headers to release version.
Jason McDonald [Thu, 19 Nov 2009 05:48:42 +0000 (15:48 +1000)]
Update license headers to release version.

Reviewed-by: Trust Me
8 years agoFrench translation of designer
Benjamin Poulain [Wed, 18 Nov 2009 19:29:15 +0000 (20:29 +0100)]
French translation of designer

Reviewed-by: Pierre Rossi
(cherry picked from commit 80cd617b05ad3e647c87dc063d40cde0617344ca)

8 years agoUpdates the french translation of qt strings in qt_fr.ts
Pierre Rossi [Wed, 18 Nov 2009 18:57:13 +0000 (19:57 +0100)]
Updates the french translation of qt strings in qt_fr.ts

Also took care of placing non breakable spaces before double
punctuation characters.

Reviewed-by: Benjamin Poulain
(cherry picked from commit f9c7a523ce7d39b9a1299267ffbfac0c220ad51c)

8 years agoFixes duplicate accelerators in french translation of assistant
Yoann Lopes [Wed, 18 Nov 2009 17:50:09 +0000 (18:50 +0100)]
Fixes duplicate accelerators in french translation of assistant

Also put non breakable spaces in front of characters such as ':', '!'
    and '?'

Reviewed-by: Pierre Rossi
(cherry picked from commit d5d1f2807d0ea0efc71a1e97a2b7e3dad9d0a482)

8 years agoSoftkeymanager to not update sofkeys when native s60 dialog is shown
Jason Barron [Wed, 18 Nov 2009 13:50:42 +0000 (15:50 +0200)]
Softkeymanager to not update sofkeys when native s60 dialog is shown

Fixes Qt Bug: QTBUG-5788 Softkeys do not change to dialog specific ones
when native S60 dialog is being opened on top of Qt application

Initial-patch-by: Markus Nolvi
Reviewed-by: axis
(cherry picked from commit 127164943f0783a4bb4d18834b5e002f08427e00)

8 years agoRemoved Browser demo from Symbian builds
Miikka Heikkinen [Wed, 18 Nov 2009 08:07:17 +0000 (10:07 +0200)]
Removed Browser demo from Symbian builds

Browser demo isn't currently compiling for Symbian GCCE builds
because ARMV5 built static uitools.lib apparently isn't compatible with
linking into GCCE application. Removed the browser from Symbian builds
as a hotfix for 4.6.0.

Task-number: QTBUG-5692
Reviewed-by: Janne Anttila
(cherry picked from commit 31d29b227a7609ab0dadca4244cafec919264ba8)
(cherry picked from commit 1b259bccdc906b9f20935897f03e0c75d1358515)

8 years agoSymbian docs: Repair some documentation damage, remove obsolete file.
Frans Englich [Wed, 18 Nov 2009 14:36:35 +0000 (15:36 +0100)]
Symbian docs: Repair some documentation damage, remove obsolete file.

Reviewed-by: TrustMe
(cherry picked from commit 6e6907962972aed3d054c1fa43b4303e4e66ccaf)

8 years agoIncorporate feedback from marketing.
Frans Englich [Wed, 18 Nov 2009 12:14:35 +0000 (13:14 +0100)]
Incorporate feedback from marketing.
(cherry picked from commit c68a67952dd89bc551c32b116ce80ac8f6ad4ef6)

8 years agoSymbian support: incorporate feedback from Lars.
Frans Englich [Wed, 18 Nov 2009 11:59:55 +0000 (12:59 +0100)]
Symbian support: incorporate feedback from Lars.

Reviewed-by: Espen Riskedal
Reviewed-by: Frans Englich
(cherry picked from commit 00085c803b144615a87d958f130883347b52a7a5)

8 years agoIncorporate feedback by Espen.
Frans Englich [Tue, 17 Nov 2009 16:19:52 +0000 (17:19 +0100)]
Incorporate feedback by Espen.

Reviewed-by: Espen Riskedal
(cherry picked from commit b6c86d947cce15e2ba85d3cfca1d9b053dce9844)

8 years agoFix typo.
Frans Englich [Tue, 17 Nov 2009 12:04:17 +0000 (13:04 +0100)]
Fix typo.

Reviewed-by: TrustMe
(cherry picked from commit 0c94723ba01240e967f589326e5245831ae46c14)