8 years agoWork around broken ATI X1600 drivers on Mac OS X v4.6.0-beta1
Gunnar Sletta [Tue, 13 Oct 2009 08:18:59 +0000 (10:18 +0200)]
Work around broken ATI X1600 drivers on Mac OS X

The GLSL implementation messes up return values from functions so that
all our srcPixel()'s become black and several matrices are off. We
don't want to rewrite the shader code to fit an "ancient" graphics
card, so we simply fall back to the GL 1 engine.

Reviewed-by: Trond
(cherry picked from commit 33ed3d0bacddce214a43be60eb6481903e753a88)
(cherry picked from commit bd94c6df873ab196e537f5a49b57c86ccd66ad90)

8 years agoAdd known issues wiki to docs.
Jesper Thomschutz [Tue, 13 Oct 2009 15:03:50 +0000 (17:03 +0200)]
Add known issues wiki to docs.

Reviewed-by: Jason McDonald
(cherry picked from commit 1ac2f104b7ab97f99a2b249b14bc5129588dbe46)

8 years agoRe-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39
Jocelyn Turcotte [Tue, 13 Oct 2009 09:34:27 +0000 (11:34 +0200)]
Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39
by Simon Hausmann

Fix crash of QtScript on Mac OS X

When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause
it to crash.

For now fall back to the use of mmap() as allocator instead.

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

8 years agocrash fix on WinCE without gesture support
Maurice Kalinowski [Tue, 13 Oct 2009 13:43:56 +0000 (15:43 +0200)]
crash fix on WinCE without gesture support

dd9d8693 added some checks causing SetGestureConfig to not be
initialized to 0. Thus it gets derefenced and causes crashes on all
WinCE applications.

Reviewed-by: denis
Reviewed-by: ninerider
(cherry picked from commit fa4d78a580fb4deb0c2c5de253b3b18a4ad18ab3)

8 years agoWorkaround for softkeys not working in modal dialogs on S60 5.0
Shane Kearns [Fri, 9 Oct 2009 16:39:40 +0000 (18:39 +0200)]
Workaround for softkeys not working in modal dialogs on S60 5.0

Set the softkey container window to be selectable even when pointer
is grabbed (via window server setting)

Task-number: QT-2203
Reviewed-by: Espen Riskedal
(cherry picked from commit 6ce22194f16ce8e2586e3787560de051064d7787)

8 years agoA new implementation of the Gesture API.
Denis Dzyubenko [Fri, 9 Oct 2009 17:09:09 +0000 (19:09 +0200)]
A new implementation of the Gesture API.

Implemented gestures using gesture events and separate
QGesture/QGestureRecognizer classes.

Reviewed-by: trustme
8 years agoColor role with higher contrast for focusrect
Alessandro Portale [Thu, 8 Oct 2009 19:20:22 +0000 (21:20 +0200)]
Color role with higher contrast for focusrect

Low-risk, high value change. Beta worthy!

As much as QPalette::Highlight sounds like a suitable
color role for drawing a focus rect... It simply did not
work well with a lot of S60 themes (e.g. the default N95
theme). QPalette::Text is a better candidate, since
the S60 themes promise a good contrast of text on
background graphics.

Reviewed-By: Sami Merilä
(cherry picked from commit a35c52abe95f224af062550e4954f7cbefca1bd8)

8 years agoFixed documentation links in README.s60
Miikka Heikkinen [Fri, 9 Oct 2009 13:24:55 +0000 (16:24 +0300)]
Fixed documentation links in README.s60

Task-number: QTBUG-4806
Reviewed-by: Janne Koskinen
(cherry picked from commit 07456fc966504c18465d80b988038b009349a0fa)

8 years agoChanged several S60 references to Symbian references in docs.
Miikka Heikkinen [Fri, 9 Oct 2009 13:16:20 +0000 (16:16 +0300)]
Changed several S60 references to Symbian references in docs.

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

8 years agoFixed miscellaneous minor problems with Symbian docs.
Miikka Heikkinen [Fri, 9 Oct 2009 12:11:26 +0000 (15:11 +0300)]
Fixed miscellaneous minor problems with Symbian docs.

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

8 years agoChanging S60 to Symbian in the Docs
Morten Engvoldsen [Thu, 8 Oct 2009 10:27:37 +0000 (12:27 +0200)]
Changing S60 to Symbian in the Docs

Changing names to Symbian platform

Task-number: QT-2268

Rev-by: Espen Riskedal
(cherry picked from commit 7d75f1427f80df87b728baa8c7f63f7a7762d280)

8 years agoChanging S60 to Symbian in the Docs
Morten Engvoldsen [Thu, 8 Oct 2009 10:26:29 +0000 (12:26 +0200)]
Changing S60 to Symbian in the Docs

Changing names to Symbian platform

Task-number: QT-2268

Rev-by: Espen Riskedal
(cherry picked from commit dac817b8d3bbcfcad34295f134dfafbf0a26c23f)

8 years agoDoc: update known issues page (a little).
Volker Hilsheimer [Fri, 9 Oct 2009 12:38:56 +0000 (14:38 +0200)]
Doc: update known issues page (a little).
(cherry picked from commit 21a84b26028ec7f44c9c5c69fa17528e77e17174)

8 years agoFix compile errors on mingw (The version supplied with Qt 4.5)
Prasanth Ullattil [Thu, 8 Oct 2009 10:11:32 +0000 (12:11 +0200)]
Fix compile errors on mingw (The version supplied with Qt 4.5)

Added the missing defines

Reviewed-by: Denis
(cherry picked from commit 1040ba2fd850196234424f769e28d513a6eb0948)

8 years agomediaplayer: crash in settings dialog.
Frans Englich [Wed, 7 Oct 2009 12:10:26 +0000 (14:10 +0200)]
mediaplayer: crash in settings dialog.

The MediaPlayer requires that an output device is available.

Task-number: QTBUG-4755
Reviewed-by: Gareth Stockwell
(cherry picked from commit 16e21cb0beb0e5f5189048b95d1cb74ae0c0702a)

8 years agoFixed initialization of the system locale on Symbian.
Denis Dzyubenko [Wed, 7 Oct 2009 10:16:04 +0000 (12:16 +0200)]
Fixed initialization of the system locale on Symbian.

Made it thread-safe and actually make sure that we don't initialize the
data several times.

Reviewed-by: axis
(cherry picked from commit 0418d438d1c1acfe2c95ee748c1e7c84a0ee8837)

8 years agoFixed a crash bug on S60 SDK 3.1.
axis [Tue, 6 Oct 2009 15:05:50 +0000 (17:05 +0200)]
Fixed a crash bug on S60 SDK 3.1.

The crash was caused by the image data not being locked before being

Also avoided an unnecessary detach copy by making the image variable
a reference.

RevBy:    Jani Hautakangas
Task:     QTBUG-4705
AutoTest: QWidget passed
(cherry picked from commit 330dc1e5895a8950615a9bbf26154f5387b023b1)

8 years ago2009-10-07 Janne Koskinen <janne.p.koskinen@digia.com>
Janne Koskinen [Wed, 7 Oct 2009 10:58:16 +0000 (10:58 +0000)]
2009-10-07 Janne Koskinen <janne.p.koskinen@digia.com>

Reviewed by Simon Hausmann.

        [Qt] Symbian SBSv2 .data segment adress fix

        RO-section in qtwebkit.dll exceeds allocated space in SBSv2. Move RW-section
        base address to start from 0x800000 instead of the toolchain default 0x400000

        * WebCore.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49239 268f45cc-cd09-0410-ab3c-d52691b4dbfc
(cherry picked from commit d73ea9d00fec200b2dd6de5e4c8f298caffa4aca)

8 years ago2009-10-06 Janne Koskinen <janne.p.koskinen@digia.com>
Janne Koskinen [Tue, 6 Oct 2009 15:27:30 +0000 (15:27 +0000)]
2009-10-06 Janne Koskinen <janne.p.koskinen@digia.com>

Reviewed by Simon Hausmann.

        [Qt] don't enable input methods on Symbian by default.

        If input methods are enabled Symbian FEP will be launched on every
        pointer event making webpage navigation impossible with QWebView.

        * Api/qwebview.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49188 268f45cc-cd09-0410-ab3c-d52691b4dbfc
(cherry picked from commit 9c23f571341811b07606db79dd4a4d44ff98acc1)

8 years agoRevert "There's no need to include qstringmatcher.h in qstringlist.h"
Marius Storm-Olsen [Wed, 7 Oct 2009 11:25:32 +0000 (13:25 +0200)]
Revert "There's no need to include qstringmatcher.h in qstringlist.h"

Source-incompatible change

This reverts commit 8714892977269591bb9b348c6eb549a7f2c45cbc.

Rev-by: Trustme
(cherry picked from commit 136f866f405a60ddbc48e4c666a0fec484f24717)

8 years agoDoc update related to Qt package name for Symbian (a3ef6e08).
Janne Anttila [Mon, 5 Oct 2009 10:30:32 +0000 (13:30 +0300)]
Doc update related to Qt package name for Symbian (a3ef6e08).

Task-number: QT-772
Reviewed-by: TrustMe
(cherry picked from commit 2fe4f4a98e1c0b727ee9fa9d168d726a9dcb36d7)

8 years agoUpdate self-signed certificate for Symbian, since the old one expired
Iain [Mon, 5 Oct 2009 11:14:55 +0000 (13:14 +0200)]
Update self-signed certificate for Symbian, since the old one expired

New certificate for using for self-signing.  Updated some organisational
details, gave this one a 10 year validity rather than a 1 year validity.

Same private key as before.

Reviewed-by: axis
(cherry picked from commit 53ea5e98eab90ee9e3ae23e3b67e8993e6c2b31c)

8 years agoFix build error introduced in change ffeb6900.
Jason McDonald [Wed, 7 Oct 2009 05:18:50 +0000 (15:18 +1000)]
Fix build error introduced in change ffeb6900.

Change ffeb6900 renamed a function but didn't rename all the calls.

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

8 years agoFixed thread lockup in win32 backend for QAudioOutput.
Kurt Korbatits [Tue, 6 Oct 2009 22:40:14 +0000 (08:40 +1000)]
Fixed thread lockup in win32 backend for QAudioOutput.
-Was not closing the WaveOut on cleanup, fixed.
-Was emitting signal in critical section, fixed.

Reviewed-by:Bill King
(cherry picked from commit 3865912d4a6c31a4981e1831e2af8d59f3eb4ac0)

8 years agoUpdate EABI DEF files for Symbian OS
Iain [Tue, 6 Oct 2009 19:34:10 +0000 (21:34 +0200)]
Update EABI DEF files for Symbian OS

Reviewed-by: TrustMe
(cherry picked from commit 2d2b4e8a77a30449d8b4ebc88979b3aff45a8222)

8 years agoAutotest: add a few more tests, with IP address and actual hostname
Jason McDonald [Wed, 7 Oct 2009 03:09:38 +0000 (13:09 +1000)]
Autotest: add a few more tests, with IP address and actual hostname
(cherry picked from commit d47b7e6d0adcd675ba9da11818b3fa9acc3caff5)



8 years agoAutotest: use port 12346 instead of 1, to ensure that it's not a
Thiago Macieira [Tue, 6 Oct 2009 18:47:52 +0000 (20:47 +0200)]
Autotest: use port 12346 instead of 1, to ensure that it's not a
firewall issue

Also check if we're not timing out instead of being able to fail.
(cherry picked from commit 9cf618492d1c89b489bf7e52e45c9577f9d52c1c)

8 years agoAPI review: change function name to setUseSystemConfiguration.
Thiago Macieira [Tue, 6 Oct 2009 18:46:39 +0000 (20:46 +0200)]
API review: change function name to setUseSystemConfiguration.

Requested-By: Volker Hilsheimer
(cherry picked from commit ffeb69003a9c676064cdf7ec099a02c2fbcf2ad3)

8 years agoPrevent OK key being processed twice in file dialog (keypad navigation)
Shane Kearns [Tue, 6 Oct 2009 16:05:17 +0000 (18:05 +0200)]
Prevent OK key being processed twice in file dialog (keypad navigation)

All key events were being explicitly ignored by the file dialog when key
navigation is enabled, and it doesn't have edit focus.
When a file is opened by pressing the OK key, there is no edit focus
after returning from accept() and the OK key can propagate outside the
modal dialog.
This causes the parent widget to receive and act upon the OK key as well
which makes problems - e.g. in QTBUG-4724, recursive menu activation

Task-number: QTBUG-4724
Reviewed-by: Alessandro Portale
(cherry picked from commit 28cdb974cce58111a19e8691f4dd929a5c9f74ea)

8 years agoOptimized restore() in GL 2 paint engine.
Samuel Rødal [Tue, 29 Sep 2009 07:42:02 +0000 (09:42 +0200)]
Optimized restore() in GL 2 paint engine.

Keep track of what state actually changed so we don't have to set all
the uniforms as dirty etc.

Reviewed-by: Trond
(cherry picked from commit 092c773b95b1f126d36ab7c918fb098ddad6cae3)

8 years agoChanged GL 2 engine render text implementation to use glDepthRange().
Samuel Rødal [Tue, 29 Sep 2009 09:00:57 +0000 (11:00 +0200)]
Changed GL 2 engine render text implementation to use glDepthRange().

This frees all the current dependencies on the depth uniform.
(cherry picked from commit 27c2df52128e32c785239dbc9322a4b7beb0078c)

8 years agoQScriptContext::parentContext: don't skip unessecary frames
Olivier Goffart [Tue, 6 Oct 2009 14:46:43 +0000 (16:46 +0200)]
QScriptContext::parentContext: don't skip unessecary frames

Calling QScriptValue::call doesn't create a fake frame.
We can detect a real fake frame as it does not have a callee.

Task-number: QT-2270
Reviewed-by: Kent Hansen
(cherry picked from commit 96b047f0f27674ee402ab3624dbb906346ac1847)

8 years agoRemoved ICON for apps and demos except fluidlauncher and desktopservices
Espen Riskedal [Tue, 6 Oct 2009 14:53:17 +0000 (16:53 +0200)]
Removed ICON for apps and demos except fluidlauncher and desktopservices

mifconv can't always handle absolute paths to the .svg specified, so for
now we don't use absolute paths, and fix it later.

Task-number: QTBUG-4693
Reviewed-by: Shane Kearns
(cherry picked from commit fa35247d31bd35d72c307f4a6a231400aade0c0b)

8 years agoBetter compile fix.
Alexis Menard [Tue, 6 Oct 2009 14:51:18 +0000 (16:51 +0200)]
Better compile fix.

(cherry picked from commit 493eb0264c095c62b6573789225a22cadf946348)

8 years agoFix crash related to audio equalizer.
Frans Englich [Tue, 6 Oct 2009 14:07:10 +0000 (16:07 +0200)]
Fix crash related to audio equalizer.

The constructor initializer relied on member variables.

Task-number: QTBUG-4689
(cherry picked from commit 54645071fad98b46a44d88b50095dc21ff63fff6)

8 years agotst_qnetworkreply: httpConnectionCount test improvements
Markus Goetz [Tue, 6 Oct 2009 14:24:06 +0000 (16:24 +0200)]
tst_qnetworkreply: httpConnectionCount test improvements

Reviewed-by: TrustMe
(cherry picked from commit 85b17ee0222d96bbd93f758ac3b2bd3139c76ec8)

8 years agoBuild fix.
Alexis Menard [Tue, 6 Oct 2009 14:12:11 +0000 (16:12 +0200)]
Build fix.
(cherry picked from commit c81b79080eb8f0c956c97fc80d5118baf7703df4)

8 years agoadd test for QT-2270
Kent Hansen [Tue, 6 Oct 2009 14:07:40 +0000 (16:07 +0200)]
add test for QT-2270
(cherry picked from commit 56187037e3fe46800bfa670197a149121f00573e)

8 years agoNeeded to set ENABLE_YARR_JIT to not compile MacroAssembler.cpp
Jørgen Lind [Mon, 5 Oct 2009 14:45:38 +0000 (16:45 +0200)]
Needed to set ENABLE_YARR_JIT to not compile MacroAssembler.cpp

Reviewed-by:Simon Hausmann <simon.hausmann@nokia.com>
(cherry picked from commit 8037c03174124bc136900c88254d118ab48b010f)

8 years agotst_qhttpnetworkconnection: Some more checks
Markus Goetz [Tue, 6 Oct 2009 13:56:34 +0000 (15:56 +0200)]
tst_qhttpnetworkconnection: Some more checks

Some more checks (test still passes)

Reviewed-by: TrustMe
(cherry picked from commit 7cbcf8e8ef91636de1727d5bd6294a9f07c66804)

8 years agoFixing the compile bug for Symbian when using ARMV5
Aleksandar Sasha Babic [Tue, 6 Oct 2009 12:55:52 +0000 (14:55 +0200)]
Fixing the compile bug for Symbian when using ARMV5

Explicit destructor was needed by compiler.

Reviewed-by: Thiago Macieira
(cherry picked from commit 15e2ecda958868b5c372bcd59cba8065c086581e)

8 years agoMade depth tested renderText() work after stencil clipping change.
Samuel Rødal [Tue, 29 Sep 2009 07:03:19 +0000 (09:03 +0200)]
Made depth tested renderText() work after stencil clipping change.

Also we should force Raster_A8 glyph format in renderText().
(cherry picked from commit 9dbcdc00239abbaf899f04fc5ecc2bdb885ad08d)

8 years agoAdded convex polygon optimization to QGL2PaintEngineExPrivate::fill().
Samuel Rødal [Mon, 28 Sep 2009 16:37:15 +0000 (18:37 +0200)]
Added convex polygon optimization to QGL2PaintEngineExPrivate::fill().
(cherry picked from commit d846af0de2ee2b3b76f81f2c0fd3ccceb645b511)

8 years agoSwitched to using stencil instead of depth buffer for clipping.
Samuel Rødal [Tue, 6 Oct 2009 13:38:54 +0000 (15:38 +0200)]
Switched to using stencil instead of depth buffer for clipping.

Based on Aaron Kennedy's patch. All tests are green, but when enabling
scissoring UniteClip seems to be broken atm.
(cherry picked from commit 6b623c04060d274c048c0d4c6dbc5a90d1c31604)

8 years agoMoved GL 2 clip clearing code into a common function.
Samuel Rødal [Mon, 28 Sep 2009 08:31:46 +0000 (10:31 +0200)]
Moved GL 2 clip clearing code into a common function.
(cherry picked from commit 6d17e09c274803d324e8a8db579aaafaefaab33f)

8 years agoGot rid of some redundant state changes regarding GL depth state.
Samuel Rødal [Mon, 28 Sep 2009 08:24:09 +0000 (10:24 +0200)]
Got rid of some redundant state changes regarding GL depth state.
(cherry picked from commit a815840a7f2272b128de4a52497626c49373c8c9)

8 years agoRenamed GL 2 engine variables to be clip buffer agnostic.
Samuel Rødal [Fri, 25 Sep 2009 15:36:46 +0000 (17:36 +0200)]
Renamed GL 2 engine variables to be clip buffer agnostic.
(cherry picked from commit e8c73ac916ce5cb0492c1d1ba817e59b8df34158)

8 years agoSwitched to using GL_LEQUAL instead of GL_LESS in GL 2 engine.
Samuel Rødal [Fri, 25 Sep 2009 15:30:56 +0000 (17:30 +0200)]
Switched to using GL_LEQUAL instead of GL_LESS in GL 2 engine.
(cherry picked from commit 2f268b40b290c4513d2d06b75ad681b5550eeaa8)

8 years agoMade GL 2 paint engine waste less bits in clipping algorithm.
Samuel Rødal [Fri, 25 Sep 2009 15:20:50 +0000 (17:20 +0200)]
Made GL 2 paint engine waste less bits in clipping algorithm.
(cherry picked from commit aaf695a3fad8d84f3d9483a573732350445d453a)

8 years agoRefactored GL 2 engine UniteClip to always increase max depth.
Samuel Rødal [Fri, 25 Sep 2009 15:22:48 +0000 (17:22 +0200)]
Refactored GL 2 engine UniteClip to always increase max depth.
(cherry picked from commit af8ff76bf25b6b4d01d89bea42baab65ed7e09ea)

8 years agoMoved maxDepth out of state object and got rid of unused state members.
Samuel Rødal [Fri, 25 Sep 2009 15:02:53 +0000 (17:02 +0200)]
Moved maxDepth out of state object and got rid of unused state members.
(cherry picked from commit 6372c2865ab6924127b78f968bdd41f8d3f9c637)

8 years agoFixed missing stencil buffer clear when scissor testing is disabled.
Samuel Rødal [Fri, 25 Sep 2009 15:12:42 +0000 (17:12 +0200)]
Fixed missing stencil buffer clear when scissor testing is disabled.
(cherry picked from commit e8a3b49d6d42b213fd4fd55837f6180935a8a603)

8 years agoadd missing include
Kent Hansen [Tue, 6 Oct 2009 13:21:01 +0000 (15:21 +0200)]
add missing include

Necessary since the SignalEvent class was moved to qstatemachine.h.
(cherry picked from commit cbc2508fc8cb0f16a061f778f777f8363640fcc8)

8 years agoFixed some projective transform rendering bugs on qreal=float platforms.
Samuel Rødal [Fri, 2 Oct 2009 11:18:52 +0000 (13:18 +0200)]
Fixed some projective transform rendering bugs on qreal=float platforms.

We should set the near clip slightly higher when qreal is float to avoid
numerical precision problems.

Reviewed-by: Trond
(cherry picked from commit addc0cbdbe21da27f7ad9f0ee05a16e24afa392d)

8 years agoFixed bug in GL 2 engine when using beginNativePainting.
Samuel Rødal [Fri, 2 Oct 2009 10:38:16 +0000 (12:38 +0200)]
Fixed bug in GL 2 engine when using beginNativePainting.

Need to set shader manager to dirty in case we change the shader program
using native calls.

Reviewed-by: Trond
(cherry picked from commit 283670c8fbdda2898879066c7e14d3b0cb5ef442)

8 years agocompile without QT3SUPPORT
Joerg Bornemann [Tue, 6 Oct 2009 13:06:16 +0000 (15:06 +0200)]
compile without QT3SUPPORT

Reviewed-by: thartman
(cherry picked from commit 971adae01406f71ed9f0bb9cb2be5eddc259e77e)

8 years agoQAbstractSocket::setSocketOption: Make const reference
Markus Goetz [Tue, 6 Oct 2009 12:53:15 +0000 (14:53 +0200)]
QAbstractSocket::setSocketOption: Make const reference

After 4.6 API review.

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

8 years agotst_QGraphicsView::task245469_itemsAtPointWithClip Windows mobile fix
Joerg Bornemann [Tue, 6 Oct 2009 09:38:02 +0000 (11:38 +0200)]
tst_QGraphicsView::task245469_itemsAtPointWithClip Windows mobile fix

We must make sure that the graphics view scene is centered to make
this test work. On Windows mobile, the widget was too wide and the
scene wasn't centered.

Reviewed-by: thartman
(cherry picked from commit 1627b135a7ec37862d7e3764fd545e75ca38bfd7)

8 years agotst_QGraphicsLinearLayout::layoutDirection fixed for Windows mobile
Joerg Bornemann [Tue, 6 Oct 2009 09:08:42 +0000 (11:08 +0200)]
tst_QGraphicsLinearLayout::layoutDirection fixed for Windows mobile

This test depends on a layout spacing set to 6.
The Windows mobile style has layout spacing 8.

Reviewed-by: mauricek
(cherry picked from commit ad52b10726aa72c253e220c06d3c7c76ef76366e)

8 years agotst_qnetworkreply: Add ioPostToHttpsUploadProgress
Markus Goetz [Mon, 5 Oct 2009 15:08:29 +0000 (17:08 +0200)]
tst_qnetworkreply: Add ioPostToHttpsUploadProgress

Add a currently failing testcase. Related to task 261806 and others.

Reviewed-by: Peter Hartmann
(cherry picked from commit 6bbe0f3105fb8ec70aeb0952bec671b72b9f5400)

8 years agoFix crash in QPlainTextEdit when using large fonts
Eskil Abrahamsen Blomfeldt [Tue, 6 Oct 2009 12:26:58 +0000 (14:26 +0200)]
Fix crash in QPlainTextEdit when using large fonts

When using very large fonts, sometimes the scrollbar of the
QPlainTextEdit will allow you to do scroll down past the end of the
document, in which case the currentBlock in hitTest() is inValid() which
caused an assert in currentBlock.next().

Task-number: QT-938
Reviewed-by: mae
(cherry picked from commit d824af2348d11a7f364a1046a704268830f35f13)

8 years agoNumerical issues on Windows CE caused some image comparisons to fail.
ninerider [Tue, 6 Oct 2009 12:23:46 +0000 (14:23 +0200)]
Numerical issues on Windows CE caused some image comparisons to fail.

On Windows CE and possibly Symbian some filtering and blending functions
of the SVG renderer will alter different pixels in two otherwise
apparently identical images. Until this is not addressed in the
renderers an exact image comparison is not alsways successful.

Reviewed-by: banana joe
(cherry picked from commit ba4c0b0048bab894047bc363ef7f7a3e12ef4d02)

8 years agoSpan update after row and column insertion and removal in QTableView.
Gabriel de Dietrich [Fri, 25 Sep 2009 17:59:12 +0000 (19:59 +0200)]
Span update after row and column insertion and removal in QTableView.

The feature had not been implemented yet. Auto-test and benchmark included.
As a bonus, single cell spans are no longer added to the span collection.

Reviewed-by: Thierry
Task-number: 245327
Task-number: QTBUG-3610
(cherry picked from commit 0d51611fa524091ddca3c6c11edb0eae8ffe3b02)

8 years agoSmall doclet fix
Thomas Zander [Mon, 28 Sep 2009 15:55:24 +0000 (17:55 +0200)]
Small doclet fix

Rev-By: Trust-Me
(cherry picked from commit 6c14af1cdb02d1d6957ad23ec435e2b95dda5b4a)

8 years agoFixed an assert occuring on X11 when destroying QPixmaps under GL.
Trond Kjernåsen [Tue, 6 Oct 2009 11:46:13 +0000 (13:46 +0200)]
Fixed an assert occuring on X11 when destroying QPixmaps under GL.

The cleanup code for the QX11PixmapData was called incorrectly for

Reviewed-by: Samuel
(cherry picked from commit cb368e06bea269422efcbdbe8136d424b6ff5052)

8 years agoCorrected Qt logo colors.
Alessandro Portale [Tue, 6 Oct 2009 11:45:48 +0000 (13:45 +0200)]
Corrected Qt logo colors.

Replaced the poisonous green by the 'official' one. Took the RGB
values from the logos availiable at:

Reviewed-By: TrustMe
(cherry picked from commit a6bf8c28a8b8792167f6c93a08e871376651ba1a)

8 years agoChanged wording on Symbian introduction doc.
Miikka Heikkinen [Tue, 6 Oct 2009 11:13:39 +0000 (14:13 +0300)]
Changed wording on Symbian introduction doc.

Executing "perl createpackage.pl" will only work in bin dir, so changed
the wording a bit.

Reviewed-by: Janne Anttila
(cherry picked from commit 9c73671c3b917a2a6a22411fb17c46dfa5e21049)

8 years agoQParallelAnimationGroup: set the correct state for the animations
Thierry Bastian [Tue, 6 Oct 2009 11:06:05 +0000 (13:06 +0200)]
QParallelAnimationGroup: set the correct state for the animations

There were cases (now covered by autotests) where the state of the
animations could be wrong.

Reviewed-by: janarve
(cherry picked from commit 1f5afc4300d3d7e3063f4e2c80a280a5098717d1)

8 years agoThe threshold for system basic timers has changed on windows
Thierry Bastian [Mon, 5 Oct 2009 13:27:55 +0000 (15:27 +0200)]
The threshold for system basic timers has changed on windows

This breaks the animations in main window because dragging a dock widget
when it is undocked creates another event loop and the Qt events are not
processed any more.

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

8 years agoOptimized window surfaces on X11 by not setting clip in the common case.
Samuel Rødal [Tue, 6 Oct 2009 10:41:09 +0000 (12:41 +0200)]
Optimized window surfaces on X11 by not setting clip in the common case.

We don't need to set a clip when the flush only contains a single
region. Not setting the clip gives us a slight performance boost.

Reviewed-by: Trond
(cherry picked from commit 6a061c1b66de4048222ef49c3d34c3e424e2a6c8)

8 years agodoc: Fixed a qdoc command that was meant to add emphasis
Thorbjørn Lindeijer [Tue, 6 Oct 2009 10:59:49 +0000 (12:59 +0200)]
doc: Fixed a qdoc command that was meant to add emphasis

It was creating another list item.
(cherry picked from commit 590b9b0e7587494e110cc3c498ff69ddab6f7520)

8 years agoimplement property getters&setters for setProperty(quint32) overload
Kent Hansen [Tue, 6 Oct 2009 10:52:58 +0000 (12:52 +0200)]
implement property getters&setters for setProperty(quint32) overload

It's better that this works rather than asserts.

Reviewed-by: Olivier Goffart
(cherry picked from commit 13cf7c64acd1652bad90966e06464b35b84e9513)

8 years agoOnly build demo-browser 32-bit if Qt was actually built 32-bit
Tor Arne Vestbø [Tue, 6 Oct 2009 10:40:49 +0000 (12:40 +0200)]
Only build demo-browser 32-bit if Qt was actually built 32-bit

Also, add same trick for PPC

Reviewed-by: MortenS
(cherry picked from commit a6ed1f886d323d68001e3e1b50efe064073691ea)

8 years agoAdd support for XFCE desktop integration
Jens Bache-Wiig [Tue, 6 Oct 2009 10:31:12 +0000 (12:31 +0200)]
Add support for XFCE desktop integration

XFCE essentially depends on gnome libraries and can use the
same integration features we provide for GNOME. Hence we
simply treat it as the GNOME desktop environment internally.
We can now also use the DESKTOP_SESSION to reliably detect
desktop environments since it has been properly standardized,
instead of relying on window manager hacks for anything but
a fallback.

Task-number: QTBUG-4737
Reviewed-by: bhughes
(cherry picked from commit 9956ef7fd66f5a0a2ebf9b810e5f6ffe3649cf20)

8 years agoAdd GNOME implementation for native filesystem icons
Jens Bache-Wiig [Tue, 6 Oct 2009 09:59:32 +0000 (11:59 +0200)]
Add GNOME implementation for native filesystem icons

This adds some code to support native filesystem icons
on GNOME. It works by resolving gnome libs and gnome-vfs dynamically,
hence we are explicitly running it on GNOME only and not KDE.
Even if it would work there as well. We are planning on adding this
functionality to the platform plugin as well.

Task-number: QTBUG-2195
Reviewed-by: joao
(cherry picked from commit 3d2ef8ab18dcf0b772d2f6ddeb5cf5295ca09db6)

8 years agostatemachine: implement cloning of a whole bunch more GUI events
Kent Hansen [Tue, 6 Oct 2009 10:09:14 +0000 (12:09 +0200)]
statemachine: implement cloning of a whole bunch more GUI events

Now using QEventTransition with almost any type of event will
actually work, instead of causing an assert.
(cherry picked from commit cadad3fdc7f6de95979f5b5be070da0853c46ba4)

8 years agoBuild the demo-browser 32-bit on Mac since there's no 64-bit Flash
Tor Arne Vestbø [Tue, 6 Oct 2009 10:02:28 +0000 (12:02 +0200)]
Build the demo-browser 32-bit on Mac since there's no 64-bit Flash

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

8 years agoFix regression in QUrl: IPv6 hosts should be lowercased like in Qt-4.5.
David Faure [Tue, 6 Oct 2009 09:31:50 +0000 (11:31 +0200)]
Fix regression in QUrl: IPv6 hosts should be lowercased like in Qt-4.5.

Merge-Request: 1709
Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>
(cherry picked from commit 8c4eb2b62983ec09bdfb2bde2723df12ac4e00ef)

8 years agoFaster case-insensitive comparison to "file" in QUrl::toLocalFile
David Faure [Tue, 6 Oct 2009 09:33:39 +0000 (11:33 +0200)]
Faster case-insensitive comparison to "file" in QUrl::toLocalFile

Merge-Request: 1709
Reviewed-By: Thiago Macieira <thiago.macieira@nokia.com>
(cherry picked from commit 914cae63fd9045b8ac5877a974551f29eec24d72)

8 years agoStabilize QWaitCondition test.
Olivier Goffart [Tue, 6 Oct 2009 09:40:12 +0000 (11:40 +0200)]
Stabilize QWaitCondition test.

Wait a little bit more for thread synchronization

Reviewed-by: Brad
(cherry picked from commit 7a8503d179e0f9afebb2ca57e824f1be61becf17)

8 years agoQtScript: Another crash fix on PowerPC
Olivier Goffart [Tue, 6 Oct 2009 09:19:40 +0000 (11:19 +0200)]
QtScript: Another crash fix on PowerPC

on 32bit PowerPC, the integer value and the pointer value are not
in the same word leading to crash.  So blindly casting between them
lead to crashes.

Use the new Register::withInt instead

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

8 years agoAutotest: add missing copyright attribution for tests copied from
Thiago Macieira [Tue, 6 Oct 2009 09:13:51 +0000 (11:13 +0200)]
Autotest: add missing copyright attribution for tests copied from
(cherry picked from commit 65a101502bb04ea95110ce6e12a3848c790eb7a1)

8 years agoProspective build fix for Solaris
Kent Hansen [Tue, 6 Oct 2009 09:04:39 +0000 (11:04 +0200)]
Prospective build fix for Solaris

"Error: "static WTF::TCMalloc_PageHeap::runScavengerThread(void*)" is expected to return a value."
(cherry picked from commit 9225889d8958e71c8683df752ff2207c11334c9a)

8 years agoAutotest: disable the globalObjects test.
Thiago Macieira [Tue, 6 Oct 2009 09:04:57 +0000 (11:04 +0200)]
Autotest: disable the globalObjects test.

We are not going to fix this in 4.5. I doubt we'll fix it in 4.6
either, so I'll reenable it for 4.7 only.
(cherry picked from commit 7ed2e44c48ac625993cf33cdbb70f82b0a3cb1af)

8 years agoUpdated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-stagin...
Kent Hansen [Tue, 6 Oct 2009 08:59:49 +0000 (10:59 +0200)]
Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-staging-06102009 ( 32d226eb14d44f80e9ec96d4ca2c595181eeeca3 )
(cherry picked from commit 72f1e06aa6238f55729c4f3606d06ad7d37fe6df)

8 years agoUnified and increased some lackey timeouts in systemsemaphore test.
Janne Anttila [Tue, 6 Oct 2009 08:51:18 +0000 (11:51 +0300)]
Unified and increased some lackey timeouts in systemsemaphore test.

In Symbian OS some timeouts needs to be higher ones, in order to
test complete correctly.

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

8 years agoDecrease tst_QThreadOnce::multipleThreads test num of thread for Symbian
Janne Anttila [Tue, 6 Oct 2009 08:41:36 +0000 (11:41 +0300)]
Decrease tst_QThreadOnce::multipleThreads test num of thread for Symbian

In Symbian OS the maximum number of thread per process depends on stack
size. With default 8KB stack size you can have 128 threads, with 16KB
stack size you can have 64 threads etc. Since all qt threads nowadays
have maximum stack size, we need to decrease the amount of threads in
this test.

Reviewed-by: TrustMe
(cherry picked from commit 56087f7ffa0c64c34f55cf24a24d9337592b6c23)

8 years agoIncreased tst_QSharedMemory::simpleProcessProducerConsumer timout.
Janne Anttila [Tue, 6 Oct 2009 08:11:40 +0000 (11:11 +0300)]
Increased tst_QSharedMemory::simpleProcessProducerConsumer timout.

Test fails sometimes in Symbian OS due to fact that lackey has not
finished it's task in given time. Increase timeout to same value as used
in waitForStarted statement.

Reviewed-by: TrustMe
(cherry picked from commit 501d0fc639e7ec9b26a102eac857123d86215ccf)

8 years agoPartially revert e58293b3b, re-adding the #ifdef for Qt 4.7
Thiago Macieira [Tue, 6 Oct 2009 08:47:34 +0000 (10:47 +0200)]
Partially revert e58293b3b, re-adding the #ifdef for Qt 4.7
(cherry picked from commit f1ea73bad48816222e192a95f8589493743f0c28)

8 years agoFixed the X11 error output from the demos/boxes demo.
Trond Kjernåsen [Tue, 6 Oct 2009 08:40:04 +0000 (10:40 +0200)]
Fixed the X11 error output from the demos/boxes demo.

After we started caching the current context internally, it revealed
an old bug: when a QGLWidget is reparented under X11, it will
get a new window id, but its context will still be bound to the
old window, so we need to rebind it.

Reviewed-by: Samuel
(cherry picked from commit 6d56096ba0f88e25efd77072f58804dd1f160c0a)

8 years agoUpdated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-stagin...
Kent Hansen [Tue, 6 Oct 2009 08:30:05 +0000 (10:30 +0200)]
Updated JavaScriptCore from /home/khansen/dev/qtwebkit to jsc-for-qtscript-4.6-staging-06102009 ( fc2005c87bbbb743eba96041210902fec821a1af )
(cherry picked from commit b7503346c1b7d245625b1b9e7cf7ae89a86467f0)

8 years agoSkipped enter/leave test for Windows CE
ninerider [Tue, 6 Oct 2009 08:21:57 +0000 (10:21 +0200)]
Skipped enter/leave test for Windows CE

Currently Windows has no proper cursor support.

Reviewed-by: Thomas Hartmann
(cherry picked from commit 1015ee9016f3a46bb05077a9eff83c8736b2541e)

8 years agoFix typo in QtCore license headers.
Jason McDonald [Tue, 6 Oct 2009 08:18:38 +0000 (18:18 +1000)]
Fix typo in QtCore license headers.

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

8 years agoStabilize tests on X11
Olivier Goffart [Tue, 6 Oct 2009 08:15:42 +0000 (10:15 +0200)]
Stabilize tests on X11
(cherry picked from commit f18ea32865521e21f47ea2745181e0e70db0266f)

8 years agoFix tst_QFontDialog::setFont
Olivier Goffart [Tue, 6 Oct 2009 07:45:52 +0000 (09:45 +0200)]
Fix tst_QFontDialog::setFont

The font size was not respected because it is taken from the
request which could only contains the pixel size.

Reviewed-by: Richard
(cherry picked from commit 146988463cc0d03be415aa8ff07031b6bcf27975)

8 years agoQScript: do not crash on PowerPC
Olivier Goffart [Mon, 5 Oct 2009 17:16:37 +0000 (19:16 +0200)]
QScript: do not crash on PowerPC

There is no 'this' register in the global context.
The computation of the this register for the global context
gives the 'codeBlock' register in the frame header.

On Intel processor, a JSValue() is 0x0 when converted to a pointer,
but this is not the case on PowerPC  (it is 0xfffffff9) so it just
crash later when acessing the code block.

Solution: special condition for the global context when getting the
'this' object

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

8 years agoFix typo in XmlPatterns license headers.
Jason McDonald [Tue, 6 Oct 2009 08:16:28 +0000 (18:16 +1000)]
Fix typo in XmlPatterns license headers.

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

8 years agoDon't output redundant setPen command when reusing PS printer
Eskil Abrahamsen Blomfeldt [Tue, 6 Oct 2009 07:55:12 +0000 (09:55 +0200)]
Don't output redundant setPen command when reusing PS printer

If you reused a printer to paint to several different files, the
results would sometimes be different, as the subsequent runs would have
redundant setPen commands in its output. This was because the simplePen
flag was not reset to its initial value when reusing the print engine.

Task-number: QTBUG-4479
Reviewed-by: Trond
(cherry picked from commit 39dc3026d1da03d5fcf8e5c516fadd7e4ea8a861)

8 years agotst_QCssParser::extractFontFamily fix Windows CE font deployment
Jason McDonald [Wed, 7 Oct 2009 02:25:17 +0000 (12:25 +1000)]
tst_QCssParser::extractFontFamily fix Windows CE font deployment

On Windows mobile we usually don't have the "Times New Roman" font.
Thus we must deploy and register it, if its not available.

Reviewed-by: mauricek
(cherry picked from commit 7851cbd64d15d39a0e9cc99efa6c2d007c935ce9)



8 years agofix tst_QAbstractItemView::task250754_fontChange for Windows CE
Jason McDonald [Wed, 7 Oct 2009 02:18:17 +0000 (12:18 +1000)]
fix tst_QAbstractItemView::task250754_fontChange for Windows CE

We need to give Windows mobile some more time to handle all internal
timer events. Otherwise QTreeView::updateScrollBars doesn't get called.

Reviewed-by: mauricek
(cherry picked from commit b1310cb8fcc4b48750f82502a7140f2ebb8a44c7)