qt:qt-iphone-clone.git
7 years agoFix typos, there is no QT_NO_SSL
Markus Goetz [Tue, 13 Apr 2010 12:25:21 +0000 (14:25 +0200)]
Fix typos, there is no QT_NO_SSL

Reviewed-by: thiago
Reviewed-by: andreas
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 13 Apr 2010 09:25:06 +0000 (11:25 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Implement some changes to the AIX xlC mkspec suggested by IBM.

7 years agoImplement some changes to the AIX xlC mkspec suggested by IBM.
Thiago Macieira [Tue, 13 Apr 2010 08:43:33 +0000 (10:43 +0200)]
Implement some changes to the AIX xlC mkspec suggested by IBM.

Set -bmaxdata to 0x8000000 for normal 32-bit Qt programs, to allow
them to access more memory. Increase that limit to the maximum allowed
when linking to QtWebKit (even though we don't support WebKit with xlC,
there are patches to do that).

For 64-bit, simply add the "big TOC" flag, which enables accessing
more symbols that cannot be reached by a 16-bit addressing. Only
QtWebKit strictly needs it, but IBM suggests as a good flag for
everyone.

Reviewed-by: Thomas Zander
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Mon, 12 Apr 2010 18:30:24 +0000 (20:30 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed app freeze if switching to offline in middle of HTTP transaction.
  Document Symbian platform security requirements on Qt APIs
  Fixed app freeze if switching to offline in middle of HTTP transaction.
  Removed QtDeclarative.dll deployment from qt.iby in 4.6 branch.
  Don't build QtXmlPatterns' command line tools on Symbian.

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Mon, 12 Apr 2010 16:41:52 +0000 (18:41 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  CSS: fixes border only affecting the first widget.
  fix closing state in QLocalSocket on Windows

7 years agoFixed app freeze if switching to offline in middle of HTTP transaction.
Aleksandar Sasha Babic [Mon, 12 Apr 2010 16:26:23 +0000 (18:26 +0200)]
Fixed app freeze if switching to offline in middle of HTTP transaction.

This is addition to the fix 4049dc98f1437cbbfdde5bd1ac16a7e69d65d254.
It works on SDKs that are setting exception on the sockets when there
are irregularities. It makes fix for QT-3274 more complete.

Task-number: QT-3274
Reviewed-by: Janne Anttila
7 years agoDocument Symbian platform security requirements on Qt APIs
Frans Englich [Fri, 26 Mar 2010 10:25:32 +0000 (11:25 +0100)]
Document Symbian platform security requirements on Qt APIs

Work done jointly by Gareth and me. Yields no qdoc errors.

Task-number: QTBUG-9342
Task-number: QTBUG-9120
Reviewed-by: Gareth Stockwell
Reviewed-by: David Boddie
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Frans Englich [Mon, 12 Apr 2010 16:03:34 +0000 (18:03 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6

7 years agoFixed app freeze if switching to offline in middle of HTTP transaction.
Janne Anttila [Mon, 12 Apr 2010 15:19:59 +0000 (18:19 +0300)]
Fixed app freeze if switching to offline in middle of HTTP transaction.

When active socket is disconnected by swithcing to offline mode, native
RSocket completes the active socket operations with KErrCancel (-3).
Open C maps this error code to POSIX errno EINTR (4). Normally in Posix
EINTR is only used to indicate that some operation was interrupted by
POSIX signal. Qt has a while loops in network operations to handle
operations interrupterd by signals. These while loops will be
effectively forever loops in Symbian due to Open C error code mapping.

Because Symbian does not have native support for signals, i.e. the
network operations can never be really interrupted by POSIX signal,
it is ok to remove these while loops completely on Symbian platform.

This fix is a workaround to Open C incorrect error mapping, and
should be removed once Open C has fixed their error mapping.

Task-number: QT-3274
Reviewed-by: Aleksandar Sasha Babic
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Mon, 12 Apr 2010 14:42:40 +0000 (16:42 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix segfault, if QPixmap::loadFromData() fails

7 years agoCSS: fixes border only affecting the first widget.
Olivier Goffart [Mon, 12 Apr 2010 13:52:14 +0000 (15:52 +0200)]
CSS: fixes border only affecting the first widget.

Rules like  "Foo { border: 2px solid; }" does not specify the border color.
When the border color is not specified, it is assumed to be black.

When reading the brush value from the cache, we should take that
into account.

Note that this logic cannot be moved into brushFromData() as it is different
for the background. (when no color is specified, it is assumed to be transparent)

Reviewed-by: jbache
Task-number: QTBUG-9674 (part one)

7 years agoRemoved QtDeclarative.dll deployment from qt.iby in 4.6 branch.
Miikka Heikkinen [Mon, 12 Apr 2010 13:02:39 +0000 (16:02 +0300)]
Removed QtDeclarative.dll deployment from qt.iby in 4.6 branch.

QtDeclarative isn't available until 4.7.

Task-number: QT-3163
Reviewed-by: TrustMe
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Mon, 12 Apr 2010 12:55:28 +0000 (14:55 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Improved support for OPTION and LINKEROPTION statements in MMP files

7 years agofix closing state in QLocalSocket on Windows
Joerg Bornemann [Fri, 9 Apr 2010 14:13:57 +0000 (16:13 +0200)]
fix closing state in QLocalSocket on Windows

When closing a QLocalSocket, which has unwritten data, the pipe writer
was never deleted. Thus writing after a reconnect didn't work.

Task-number: QTBUG-9681
Reviewed-by: ossi
7 years agoFix segfault, if QPixmap::loadFromData() fails
Johannes Zellner [Mon, 12 Apr 2010 11:46:00 +0000 (13:46 +0200)]
Fix segfault, if QPixmap::loadFromData() fails

Reviewed-by: Harald Fernengel
7 years agoImproved support for OPTION and LINKEROPTION statements in MMP files
Miikka Heikkinen [Mon, 12 Apr 2010 10:59:34 +0000 (13:59 +0300)]
Improved support for OPTION and LINKEROPTION statements in MMP files

VERSION_FLAGS.<keyword> can now be used for all compilers and not
just armcc, and version flagging can now be used with QMAKE_LFLAGS
as well as QMAKE_CXXFLAGS.

Also, MMP_OPTION_KEYWORDS variable is used to define supported keywords
for OPTION and LINKEROPTION statements, which are defined via
QMAKE_CXXFLAGS.<keyword> and QMAKE_LFLAGS.<keyword> variables.
This improves flexibility in the future if new keywords need to be
supported.

Task-number: QTBUG-8685
Reviewed-by: Janne Koskinen
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Mon, 12 Apr 2010 11:06:25 +0000 (13:06 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix crash with QTextEdit::textChanged() when deleting a character

7 years agoFix crash with QTextEdit::textChanged() when deleting a character
Eskil Abrahamsen Blomfeldt [Mon, 12 Apr 2010 08:06:38 +0000 (10:06 +0200)]
Fix crash with QTextEdit::textChanged() when deleting a character

QTextEdit::textChanged() will be emitted from a function called from
within QTextCursorPrivate. If the code connected to textChanged()
makes a local copy of the current text cursor and then causes it
to detach, we will crash when returning to QTextCursorPrivate and
trying to access the now-deleted data. To avoid this, we make a local
reference to the current text cursor that gives us a guarantee that
it will be valid throughout the delete-call.

Task-number: QTBUG-9599
Reviewed-by: Gunnar
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Mon, 12 Apr 2010 08:58:11 +0000 (10:58 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  econd half of the crash fix for codecs on Symbian

7 years agoecond half of the crash fix for codecs on Symbian
Lars Knoll [Mon, 12 Apr 2010 08:50:29 +0000 (10:50 +0200)]
econd half of the crash fix for codecs on Symbian

Ensure that we do not try to use any codecs if we don't have a
cleanup stack available on Symbian.

Task-number: QT-3255
Reviewed-by: Iain
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Sun, 11 Apr 2010 20:38:31 +0000 (22:38 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Autotest: Use the file in the non-writeable area
  Autotest: moved these to the qtest/ dir
  Fix problem with accessibility clients not getting info from QFileDialog

7 years agoAutotest: Use the file in the non-writeable area
Thiago Macieira [Fri, 9 Apr 2010 15:13:01 +0000 (17:13 +0200)]
Autotest: Use the file in the non-writeable area

7 years agoAutotest: moved these to the qtest/ dir
Thiago Macieira [Fri, 9 Apr 2010 13:23:44 +0000 (15:23 +0200)]
Autotest: moved these to the qtest/ dir

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Sun, 11 Apr 2010 16:54:41 +0000 (18:54 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix problem with accessibility clients not getting info from QFileDialog

7 years agoFix problem with accessibility clients not getting info from QFileDialog
Andy Shaw [Sun, 11 Apr 2010 16:50:56 +0000 (18:50 +0200)]
Fix problem with accessibility clients not getting info from QFileDialog

This fixes a problem with accessibility and QFileDialog, in addition the
fix to complexwidgets.cpp will also fix any itemview that uses a root
index.

Reviewed-by: Jan-Arve
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Sat, 10 Apr 2010 23:21:26 +0000 (01:21 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix a crash with global static objects

7 years agoFix a crash with global static objects
Lars Knoll [Sat, 10 Apr 2010 22:59:07 +0000 (00:59 +0200)]
Fix a crash with global static objects

When global static objects use text codecs in their constructor
or destructor we would crash on symbian, as the symbian
codec was trying to use a non existing cleanup stack.

Task-number: QT-3255
Reviewed-by: Espen Riskedal
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Frans Englich [Sat, 10 Apr 2010 18:47:51 +0000 (20:47 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Fri, 9 Apr 2010 20:29:20 +0000 (22:29 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Autotest: same as previous commit
  Autotest: fix network test failure

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Fri, 9 Apr 2010 18:43:14 +0000 (20:43 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Enable preserved swap behavior when surface is created due to resize.
  Generate triggered signal even the action launches menu in Symbian.
  Symbian emulator: unload file server so apps can be recompiled.
  Clear QFontCache TLS content before nullifying TLS pointer.
  Fixed focus and window activation events on Symbian when opening menu.
  QTBUG-4887 and other exception safety fixes

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Fri, 9 Apr 2010 16:53:06 +0000 (18:53 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Doc: we don't ship a qconfig executable in the Windows CE packages
  Fixed possible data corruption in the triangulating stroker.
  Fixed caching of QPainter patterns in the GL 2 engine.
  Fixes CursorChange and TooltipChange events delivery for QGraphicsWidget
  QTableView: fix spans corruption when removing spans.
  Fixes painting artifacts when scaling a QGraphicsProxyWidget.
  Fix <MemLeak> valgrind report shows memory leak for QImage::save().
  Fix test sql for sql server.

7 years agoAutotest: same as previous commit
Thiago Macieira [Fri, 9 Apr 2010 15:29:42 +0000 (17:29 +0200)]
Autotest: same as previous commit

7 years agoAutotest: fix network test failure
Thiago Macieira [Fri, 9 Apr 2010 15:25:03 +0000 (17:25 +0200)]
Autotest: fix network test failure

7 years agoDoc: we don't ship a qconfig executable in the Windows CE packages
Joerg Bornemann [Fri, 9 Apr 2010 15:01:32 +0000 (17:01 +0200)]
Doc: we don't ship a qconfig executable in the Windows CE packages

Task-number: QTBUG-9655
Reviewed-by: thartman
7 years agoDon't build QtXmlPatterns' command line tools on Symbian.
Frans Englich [Fri, 9 Apr 2010 15:10:00 +0000 (17:10 +0200)]
Don't build QtXmlPatterns' command line tools on Symbian.

Brought up by Espen.

Reviewed-by: Espen Riskedal
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Fri, 9 Apr 2010 14:59:19 +0000 (16:59 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Regressions in Global Object prototype access
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 )
  Autotest: fix paths on the test server after update.
  Fix typo in docs.

7 years agoRegressions in Global Object prototype access
Kent Hansen [Fri, 9 Apr 2010 13:43:35 +0000 (15:43 +0200)]
Regressions in Global Object prototype access

In 4.5, changing the prototype of the (custom) global object used
to "Just Work"(tm).

In the JSC-based back-end, the built-in global object acts as a
proxy if a custom global object is set, because JSC doesn't (yet,
anyway) provide a way to replace the global object.

To complicate this further, we also have a proxy to the original
global object (that bypasses the custom global object proxying (!)).
This is so that properties of the original global object can
still be accessed with the QtScript C++ API when a custom global
object has been set.

Unfortunately, JSObject::prototype()/setPrototype() are not virtual,
meaning that a change of prototype in the source object is not
reflected in the proxy or vice versa.

Work around this for now by syncing the prototype at the appropriate
places (QScriptEngine::setGlobalObject(), QScriptValue::setPrototype()).
This fixes all except the case when a prototype is set from JS,
since such a write doesn't go through our public C++ API. But this
case can be detected and handled by the global object's
JSObject::put() reimplementation. Created a separate report for that
issue: QTBUG-9737.

Task-number: QTBUG-7066
Reviewed-by: Jedrzej Nowacki
7 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb6...
Simon Hausmann [Fri, 9 Apr 2010 12:15:07 +0000 (14:15 +0200)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62 )

Changes in WebKit/qt since the last update:

* r51006 --  https://bugs.webkit.org/show_bug.cgi?id=31475 -- Crash in StringHash::equal due to unaligned string data

7 years agoEnable preserved swap behavior when surface is created due to resize.
Jason Barron [Fri, 9 Apr 2010 11:21:32 +0000 (13:21 +0200)]
Enable preserved swap behavior when surface is created due to resize.

When the QVG_RECREATE_ON_SIZE_CHANGE macro is defined the EGL surface
is recreated. However, after creating the surface, we were neglecting
to set the surface attribute that enabled the preserved swapping
behavior of EGL. This lead to flicker because every second frame was
swapping with an empty buffer and only the dirty areas were being
painted leaving the rest empty.

Reviewed-by: Lars Knoll
Reviewed-by: Aleksandar Sasha Babic
Task-number: QT-3198
Task-number: QT-3184
Task-number: QT-3201

7 years agoFixed possible data corruption in the triangulating stroker.
Trond Kjernåsen [Fri, 9 Apr 2010 11:15:16 +0000 (13:15 +0200)]
Fixed possible data corruption in the triangulating stroker.

In the case where a polygon or polyline that contains consequtive equal
points, we end up calculating an invalid normal vector for the joins.
This fix skips past duplicate consequtive points.

Task-number: QTBUG-9548
Reviewed-by: Kim
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Fri, 9 Apr 2010 11:09:42 +0000 (13:09 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Generate triggered signal even the action launches menu in Symbian.
  Symbian emulator: unload file server so apps can be recompiled.
  Clear QFontCache TLS content before nullifying TLS pointer.
  Fixed focus and window activation events on Symbian when opening menu.
  QTBUG-4887 and other exception safety fixes

7 years agoAutotest: fix paths on the test server after update.
Thiago Macieira [Fri, 9 Apr 2010 10:51:11 +0000 (12:51 +0200)]
Autotest: fix paths on the test server after update.

Reviewed-by: Trust Me
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Fri, 9 Apr 2010 09:20:17 +0000 (11:20 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed caching of QPainter patterns in the GL 2 engine.
  Fixes CursorChange and TooltipChange events delivery for QGraphicsWidget
  QTableView: fix spans corruption when removing spans.
  Fixes painting artifacts when scaling a QGraphicsProxyWidget.
  Fix <MemLeak> valgrind report shows memory leak for QImage::save().
  Fix test sql for sql server.

7 years agoGenerate triggered signal even the action launches menu in Symbian.
Janne Anttila [Thu, 8 Apr 2010 10:55:21 +0000 (13:55 +0300)]
Generate triggered signal even the action launches menu in Symbian.

Triggered signal is useful for detecting native 'Options' menu
launches in Symbian. QMenu::aboutToShow event is currently also not
generated, but that is part of another bug report. And
QMenu::aboutToShow would not even be generated for 'Options' menu
itself but only for its sub/cascade menus.

Task-number: QTBUG-9669
Reviewed-by: Sami Merila
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Fri, 9 Apr 2010 07:30:11 +0000 (09:30 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix typo in docs.

7 years agoFix typo in docs.
Jason McDonald [Fri, 9 Apr 2010 06:16:40 +0000 (16:16 +1000)]
Fix typo in docs.

Task-number: QT-1632
Reviewed-by: Trust Me
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Fri, 9 Apr 2010 05:27:28 +0000 (07:27 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Corruption in data captured by QAudioInput
  Just one (static) waveInCriticalSection but multiple QAudioInput to
  Mismatch between reported and actual supported sample rates in

7 years agoCorruption in data captured by QAudioInput
Kurt Korbatits [Fri, 9 Apr 2010 05:12:43 +0000 (15:12 +1000)]
Corruption in data captured by QAudioInput
Increased default buffer size and period size for windows.
11025monoS16LE was choppy, needed bigger periods.

Task-number:QTBUG-9101
Reviewed-by:Derick Hawcroft

7 years agoJust one (static) waveInCriticalSection but multiple QAudioInput to
Kurt Korbatits [Fri, 9 Apr 2010 02:59:47 +0000 (12:59 +1000)]
Just one (static) waveInCriticalSection but multiple QAudioInput to
record from different soundcards

Task-number:QTBUG-9221
Reviewed-by:Andrew den Exter

7 years agoSymbian emulator: unload file server so apps can be recompiled.
Frans Englich [Thu, 8 Apr 2010 12:44:18 +0000 (14:44 +0200)]
Symbian emulator: unload file server so apps can be recompiled.

Mentioned in the Qt S60 team developer journal, 23.05.2008. Code &
investigation by Janne Anttila.

Reviewed-by: Janne Koskinen
7 years agoClear QFontCache TLS content before nullifying TLS pointer.
Janne Koskinen [Thu, 8 Apr 2010 10:07:27 +0000 (13:07 +0300)]
Clear QFontCache TLS content before nullifying TLS pointer.

If not cleared server handles are left open causing
Font Server to Panic with KErrInUse in Symbian.

Task-number: QTBUG-9565
Reviewed-by: Simon Hausmann
7 years agoFixed focus and window activation events on Symbian when opening menu.
Janne Anttila [Thu, 8 Apr 2010 05:29:21 +0000 (08:29 +0300)]
Fixed focus and window activation events on Symbian when opening menu.

As described in QTBUG-8698, Qt for Symbian has been generating
incorrect focus and window activation events. This has happened since
launching menu from QSoftkeyManager with TryDisplayMenuBarL, invokes
eventually QSymbianControl::FocusChanged. But when the FocusChanged is
called menu being launched is not yet set to visible, meaning that
IsDisplayingMenuOrDialog returns false.

Because there is no way in platform to detect that menu is being
launhced, the fix is to add a new flag QS60Data, which can be used to
detect if FocusChanged event is received due to the fact that menu
is being constructed/launched.

Task-number: QTBUG-8698
    * Fixes issues 2, 3 and 4
Reviewed-by: Sami Merila
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Kurt Korbatits [Wed, 7 Apr 2010 22:56:10 +0000 (08:56 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6

7 years agoMismatch between reported and actual supported sample rates in
Kurt Korbatits [Wed, 7 Apr 2010 22:51:53 +0000 (08:51 +1000)]
Mismatch between reported and actual supported sample rates in
QtMultimedia backend for Windows
-Added 8000 as long as another frequency is available.
-options available changed from hard-coded to detected options.

Task-number:QTBUG-9100
Reviewed-by:Derick Hawcroft

7 years agoFixed caching of QPainter patterns in the GL 2 engine.
Trond Kjernåsen [Wed, 7 Apr 2010 14:21:57 +0000 (16:21 +0200)]
Fixed caching of QPainter patterns in the GL 2 engine.

The patterns all got the same cache key (e.g. 1), which caused the
patterns to be uploaded as a texture every single time they were used.

Reviewed-by: Kim
7 years agoFixes CursorChange and TooltipChange events delivery for QGraphicsWidget
Yoann Lopes [Wed, 7 Apr 2010 11:36:02 +0000 (13:36 +0200)]
Fixes CursorChange and TooltipChange events delivery for QGraphicsWidget

As the documentation mentions, these two events are delivered
respectively after the cursor has changed and after the tooltip has
changed. These two events were previously delivered just before.
This patch is needed for fixing QTBUG-5349 even if it is not directly
related.

Auto-test included.

Reviewed-by: bnilsen
7 years agoQTableView: fix spans corruption when removing spans.
Olivier Goffart [Wed, 7 Apr 2010 11:44:20 +0000 (13:44 +0200)]
QTableView: fix spans corruption when removing spans.

- We should not do -1 after erasing, as it is done later on.
- We should consider the 0 height even if it is not the last span.
- Added an assert.

Task-number: QTBUG-9631
Reviewed-by: Gabriel
7 years agoFixes painting artifacts when scaling a QGraphicsProxyWidget.
Yoann Lopes [Tue, 6 Apr 2010 12:38:47 +0000 (14:38 +0200)]
Fixes painting artifacts when scaling a QGraphicsProxyWidget.

Incorrect simple conversion of the exposed rect from QRectF to QRect
when rendering the widget.

Task-number: QTBUG-7296
Reviewed-by: bnilsen
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Wed, 7 Apr 2010 08:57:12 +0000 (10:57 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  QTBUG-4887 and other exception safety fixes

7 years agoQTBUG-4887 and other exception safety fixes
mread [Tue, 6 Apr 2010 13:05:01 +0000 (14:05 +0100)]
QTBUG-4887 and other exception safety fixes

This change includes a fix for QTBUG-4887 and other exception safety
problems found while testing it.

The QTBUG-4887 fix is to qimage.cpp. QImage doesn't throw exceptions on
failure like a proper class should, instead it tries to fail "nice".
What happens here is that setAlphaChannel would crash on OOM as after
the convertToFormat call, d could be NULL. This new version checks the
result of the conversion before using it.

The other fixes are all cases where exceptions were thrown from
destructors. I added code to the test app to help debug these cases,
and I fixed all the problems I found.

With these changes, tst_exceptionsafety_objects runs and passes on the
Symbian emulator.

Reviewed-by: Shane Kearns
7 years agoFix <MemLeak> valgrind report shows memory leak for QImage::save().
Stefano Pironato [Mon, 29 Mar 2010 12:56:27 +0000 (15:56 +0300)]
Fix <MemLeak> valgrind report shows memory leak for QImage::save().

Reviewed-by: Marius Storm-Olsen
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Wed, 7 Apr 2010 06:33:00 +0000 (08:33 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix test sql for sql server.

7 years agoFix test sql for sql server.
Bill King [Wed, 7 Apr 2010 05:42:36 +0000 (15:42 +1000)]
Fix test sql for sql server.

Sql server requires explicitly setting fields to be nullable.

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Wed, 7 Apr 2010 04:31:31 +0000 (06:31 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Remove qWait functions as it is used in QTRY_* macros.

7 years agoRemove qWait functions as it is used in QTRY_* macros.
Toby Tomkins [Wed, 7 Apr 2010 04:12:37 +0000 (14:12 +1000)]
Remove qWait functions as it is used in QTRY_* macros.

Reviewed-by: jason mcdonald
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 17:37:15 +0000 (19:37 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e3dc4ef2b801d91e115c54f833fa7766d392ceda )

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 15:40:48 +0000 (17:40 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e3dc4ef2b801d91e115c54f833fa7766d392ceda )

7 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e3dc4e...
Simon Hausmann [Tue, 6 Apr 2010 14:49:25 +0000 (16:49 +0200)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e3dc4ef2b801d91e115c54f833fa7766d392ceda )

Changes in WebKit/qt since the last update:

* r51006 --  https://bugs.webkit.org/show_bug.cgi?id=31475 -- Crash in StringHash::equal due to unaligned string data

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 13:45:10 +0000 (15:45 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix crash for multiscript text in QTextEngine::boundingBox()

7 years agoFix crash for multiscript text in QTextEngine::boundingBox()
Eskil Abrahamsen Blomfeldt [Tue, 6 Apr 2010 13:32:29 +0000 (15:32 +0200)]
Fix crash for multiscript text in QTextEngine::boundingBox()

The logClusters pointer is already adjusted for the item, so it should
be indexed relative to the item, hence from 0 to itemLength-1. Adding
pos to the index would give us a random value for all script items > 0.
Thus this would sometimes crash for text that spanned several scripts,
since we would sometimes get a value back which was outside the bounds
of the glyph array.

Task-number: QTBUG-9374
Reviewed-by: Samuel
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Tue, 6 Apr 2010 11:13:20 +0000 (13:13 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fixed modal dialog not to have automatic "Exit" right softkey in S60.

7 years agoFixed modal dialog not to have automatic "Exit" right softkey in S60.
Janne Anttila [Tue, 6 Apr 2010 10:25:59 +0000 (13:25 +0300)]
Fixed modal dialog not to have automatic "Exit" right softkey in S60.

During softkey refactoring this piece of code get changes, but the
changed code did not work correctly if window had no softkey actions.
Switched back to old way where softkey source is stored to variable,
and windowType is asked from stored variable. If softkey source is
dialog or popup, "Exit" is not added automatically to RSK.

Task-number: QT-2203
Reviewed-by: Sami Merila
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Tue, 6 Apr 2010 04:58:15 +0000 (06:58 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Remove qWait functions as it is used in QTRY_* macros.
  QAudioInput: possible change of state without emitting stateChange()
  Did not include updated repaint number for parent item in revert.
  Partially revert "Remove qWait functions as it is used in QTRY_* macros."
  Remove qWait functions as it is used in QTRY_* macros.

7 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4...
Toby Tomkins [Tue, 6 Apr 2010 03:48:07 +0000 (13:48 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-multimedia

7 years agoRemove qWait functions as it is used in QTRY_* macros.
Toby Tomkins [Tue, 6 Apr 2010 03:43:38 +0000 (13:43 +1000)]
Remove qWait functions as it is used in QTRY_* macros.

Reviewed-by: rohan mcgovern
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Kurt Korbatits [Tue, 6 Apr 2010 02:38:43 +0000 (12:38 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6

7 years agoQAudioInput: possible change of state without emitting stateChange()
Kurt Korbatits [Tue, 6 Apr 2010 02:35:01 +0000 (12:35 +1000)]
QAudioInput: possible change of state without emitting stateChange()
Removed state change from close() function, should be set by caller
depending on context.

Task-number:QTBUG-9357
Reviewed-by:Dmytro Poplavskiy

7 years agoDid not include updated repaint number for parent item in revert.
Toby Tomkins [Tue, 6 Apr 2010 01:54:19 +0000 (11:54 +1000)]
Did not include updated repaint number for parent item in revert.

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Mon, 5 Apr 2010 13:20:04 +0000 (15:20 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Partially revert "Remove qWait functions as it is used in QTRY_* macros."
  Remove qWait functions as it is used in QTRY_* macros.

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Mon, 5 Apr 2010 11:25:52 +0000 (13:25 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Implementing QFontEngineS60::getSfntTableData()

7 years agoImplementing QFontEngineS60::getSfntTableData()
Alessandro Portale [Mon, 5 Apr 2010 11:20:27 +0000 (13:20 +0200)]
Implementing QFontEngineS60::getSfntTableData()

That function was not yet implementing. Its absense caused some
Harfbuzz based shaping not to happen.

See Robert DeWolf's comment on task QTBUG-5857

Since QFontEngineS60 is private implementation and generally not
exported, no symbols need to be added to the .def files for this patch.

Task-number: QTBUG-5857
Reviewed-by: trustme
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Sat, 3 Apr 2010 19:30:07 +0000 (21:30 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Partially revert "Remove qWait functions as it is used in QTRY_* macros."
  Remove qWait functions as it is used in QTRY_* macros.

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Sat, 3 Apr 2010 17:34:00 +0000 (19:34 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix doc for deprecated QGridLayout::colSpacing: point to existing method
  qDebug() << myPointF would remove spaces in following arguments.

7 years agoFix doc for deprecated QGridLayout::colSpacing: point to existing method
David Faure [Sat, 3 Apr 2010 17:23:57 +0000 (19:23 +0200)]
Fix doc for deprecated QGridLayout::colSpacing: point to existing method

Merge-request: 544
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
7 years agoqDebug() << myPointF would remove spaces in following arguments.
David Faure [Sat, 3 Apr 2010 17:23:56 +0000 (19:23 +0200)]
qDebug() << myPointF would remove spaces in following arguments.

Merge-request: 544
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Thu, 1 Apr 2010 15:04:20 +0000 (17:04 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Partially revert "Remove qWait functions as it is used in QTRY_* macros."
  Remove qWait functions as it is used in QTRY_* macros.

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Thu, 1 Apr 2010 13:09:51 +0000 (15:09 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix crash in the fileiconprovider for Windows

7 years agoFix crash in the fileiconprovider for Windows
Jens Bache-Wiig [Thu, 1 Apr 2010 12:57:21 +0000 (14:57 +0200)]
Fix crash in the fileiconprovider for Windows

In some cases the fileiconprovider has been reported to crash
while accessing icons with overlays. This situation got
worse with change b67bd25be08b54c3e6e49b2b9429e54ff58db268
since these cases were often hidden by broken caching.

The workaround for now is to simply check that the hIcon structure
is non empty before converting the icon.

Task-number: QTBUG-8324
Reviewed-by: ogoffart
7 years agoPartially revert "Remove qWait functions as it is used in QTRY_* macros."
Toby Tomkins [Thu, 1 Apr 2010 07:50:53 +0000 (17:50 +1000)]
Partially revert "Remove qWait functions as it is used in QTRY_* macros."

Needs investigation of autotest failures on QWS, osx, win platforms.

This reverts commit 741b75b8e595a26944ba8fca8835463787b02676.

Conflicts:

tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp

7 years agoMerge commit 'origin/4.6' into 4.6-multimedia
Toby Tomkins [Thu, 1 Apr 2010 01:23:42 +0000 (11:23 +1000)]
Merge commit 'origin/4.6' into 4.6-multimedia

Conflicts:
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp

7 years agoMerge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4...
Toby Tomkins [Thu, 1 Apr 2010 00:52:15 +0000 (10:52 +1000)]
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-multimedia

7 years agoRemove qWait functions as it is used in QTRY_* macros.
Toby Tomkins [Thu, 1 Apr 2010 00:33:12 +0000 (10:33 +1000)]
Remove qWait functions as it is used in QTRY_* macros.

Reviewed-by: rohan mcgovern
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Wed, 31 Mar 2010 15:48:31 +0000 (17:48 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Ensure Phonon MMF backend emits aboutToFinish
  Remove compiler warning

7 years agoEnsure Phonon MMF backend emits aboutToFinish
Gareth Stockwell [Wed, 31 Mar 2010 12:49:35 +0000 (13:49 +0100)]
Ensure Phonon MMF backend emits aboutToFinish

It seems that, after a call to CMdaAudioPlayerUtility::SetPosition,
the reported position values are slightly lower than they should be.
This, combined with the fact that the backend emitted aboutToFinish
from its timer tick slot, means that the aboutToFinish signal is
sometimes not emitted at the end of an audio clip, if the position
has been advanced by seeking during playback.

This patch adds a check in the implementation of the
MMdaAudioPlayerCallback::MapcPlayComplete callback - if, at this point,
aboutToFinish has not been emitted, it is emitted now.

Task-number: QTBUG-9368
Reviewed-by: trustme
7 years agoRemove compiler warning
Gareth Stockwell [Wed, 31 Mar 2010 12:46:10 +0000 (13:46 +0100)]
Remove compiler warning

RVCT complains that a non-POD type (VideoParameters) is passed through
the TRACE_ENTRY ellipsis, when building in debug mode.

Reviewed-by: trustme
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Wed, 31 Mar 2010 12:51:36 +0000 (14:51 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix compile error with QT_NO_NETWORKDISKCACHE in QtNetwork
  Fix crash when using qDebug() on a QBrush with Qt::TexturePattern style.

7 years agoFix compile error with QT_NO_NETWORKDISKCACHE in QtNetwork
Tasuku Suzuki [Thu, 18 Mar 2010 13:58:51 +0000 (22:58 +0900)]
Fix compile error with QT_NO_NETWORKDISKCACHE in QtNetwork

Merge-request: 2332
Reviewed-by: Peter Hartmann
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Wed, 31 Mar 2010 10:55:09 +0000 (12:55 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Allow attributes to be bound after a QGLShaderProgram is linked.

7 years agoFix crash when using qDebug() on a QBrush with Qt::TexturePattern style.
David Faure [Wed, 31 Mar 2010 09:13:38 +0000 (11:13 +0200)]
Fix crash when using qDebug() on a QBrush with Qt::TexturePattern style.

Merge-request: 541
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Wed, 31 Mar 2010 08:57:04 +0000 (10:57 +0200)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix translation mistake spotted by Laurent Montel