qt:kde-qt.git
7 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b9dcd9... v4.6.3
Simon Hausmann [Mon, 31 May 2010 13:06:33 +0000 (15:06 +0200)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b9dcd9c168d9b25deb020837a67f30c2d72c9afb )

Changes in WebKit/qt since the last update:

++ b/WebKit/qt/ChangeLog
2010-05-19  Denis Dzyubenko <denis.dzyubenko@nokia.com>

        Reviewed by Kenneth Rohde Christiansen.

        When creating the UA, do not sassmue the language code is a
        two-letter iso639-1 code.

        * Api/qwebpage.cpp:
        (QWebPage::userAgentForUrl):
(cherry picked from commit 704dfe0bf4a85cb203a6bb84ab2a3db0b92d3d6b)

7 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 3bb0df...
Simon Hausmann [Sun, 30 May 2010 21:47:57 +0000 (23:47 +0200)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 3bb0df4f00fa0b3ac3abc1b6fe508080fabdeaab )

Changes in WebKit/qt since the last update:

* [Qt] Update the Symbian version for the user agent -- https://bugs.webkit.org/show_bug.cgi?id=38389
(cherry picked from commit 4bdd6722218ce2afb11b3b12e261f81d41aef82f)

7 years agoAlways construct s60 screen furniture even if not used.
Janne Koskinen [Mon, 31 May 2010 12:39:24 +0000 (15:39 +0300)]
Always construct s60 screen furniture even if not used.

Not creating screen furniture in full screen caused regression
when swapping into idle screen and back on Nokia 5800.

Task-number: QTBUG-10985
Reviewed-by: Jason Barron
(cherry picked from commit 4a4e5e7d54c559d54e9079dacb9c2fd32770f018)

7 years agoChange to release licenses for 4.6.3.
Jason McDonald [Sun, 30 May 2010 06:57:11 +0000 (16:57 +1000)]
Change to release licenses for 4.6.3.

Reviewed-by: Trust Me
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, 28 May 2010 16:35:23 +0000 (18:35 +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:
  Update def files for 4.6.3

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, 28 May 2010 14:45:00 +0000 (16: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:
  test QMultiMap::operator+= and QMultiHash::operator+=
  QMultiMap/QMultiHash:  must qualify identifier to find this declaration in dependent base class

7 years agotest QMultiMap::operator+= and QMultiHash::operator+=
Olivier Goffart [Fri, 28 May 2010 13:43:28 +0000 (15:43 +0200)]
test QMultiMap::operator+= and QMultiHash::operator+=

7 years agoQMultiMap/QMultiHash: must qualify identifier to find this declaration in dependent...
Olivier Goffart [Fri, 28 May 2010 12:41:27 +0000 (14:41 +0200)]
QMultiMap/QMultiHash:  must qualify identifier to find this declaration in dependent base class

This is required as some compiler such as clang or rvct
respect the standard more than gcc

Reviewed-by: thiago
Reviewed-by: hjk
7 years agoUpdate def files for 4.6.3
Shane Kearns [Fri, 28 May 2010 13:34:08 +0000 (14:34 +0100)]
Update def files for 4.6.3

Frozen 4.6.3 branch on top of 4.6.2 def files.

Task-number: QTBUG-8769
Reviewed-by: Trust Me
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, 28 May 2010 12:31:56 +0000 (14:31 +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:
  Handle exceptions notified by select before read/write.

7 years agoHandle exceptions notified by select before read/write.
Janne Anttila [Fri, 28 May 2010 10:40:44 +0000 (13:40 +0300)]
Handle exceptions notified by select before read/write.

Task-number: MOBILITY-800
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 [Fri, 28 May 2010 10:34:54 +0000 (12: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:
  Added support for Indonesian language on Symbian.
  Fix for Norwegian and Korean languages on symbian.
  Added Korean and Nynorsk locales support on Symbian.

7 years agoAdded support for Indonesian language on Symbian.
Denis Dzyubenko [Wed, 26 May 2010 14:09:49 +0000 (16:09 +0200)]
Added support for Indonesian language on Symbian.

We have support for ELangIndonesian, but we also need to support new
ELangIndonesian_Apac which has appeared in Symbian^3.

Task-number: QT-3369
Reviewed-by: trustme
7 years agoFix for Norwegian and Korean languages on symbian.
Denis Dzyubenko [Tue, 25 May 2010 10:55:00 +0000 (12:55 +0200)]
Fix for Norwegian and Korean languages on symbian.

Last commits added Norwegian Nynorsk and Korean locales support, however the
array that contains the mapping between symbian locale constant and locale
string should be sorted to work.

Task-number: QT-3368
Task-number: QT-3370
Reviewed-by: trustme
7 years agoAdded Korean and Nynorsk locales support on Symbian.
Denis Dzyubenko [Fri, 14 May 2010 15:03:32 +0000 (17:03 +0200)]
Added Korean and Nynorsk locales support on Symbian.

Task-number: QT-3368
Task-number: QT-3370
Reviewed-by: Thiago Macieira
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, 28 May 2010 05:55:25 +0000 (07: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:
  Add missing license header.

7 years agoAdd missing license header.
Jason McDonald [Fri, 28 May 2010 05:54:03 +0000 (15:54 +1000)]
Add missing license header.

Reviewed-by: Trust Me
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Thu, 27 May 2010 20:13:27 +0000 (22: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:
  Fixes for the s60theme tool

7 years agoFixes for the s60theme tool
Alessandro Portale [Thu, 27 May 2010 20:05:36 +0000 (22:05 +0200)]
Fixes for the s60theme tool

The main app did not return an error code but rather a int-converted
boolean.

When loading from .tdf files, the tool will now search for .svg files
directly, if the part is not found in the .tdf file.

Task-number: QTSIM-9

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Thu, 27 May 2010 18:16:21 +0000 (20:16 +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 regression with Qt::AlignRight on monospaced text in QTextLayout
  Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95f

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Thu, 27 May 2010 15:50:04 +0000 (17:50 +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:
  Post QResizeEvent from QSymbianControl::SizeChanged even when invisible
  Moved Symbian-specific .pro directive into symbian{} block

7 years agoPost QResizeEvent from QSymbianControl::SizeChanged even when invisible
Gareth Stockwell [Thu, 27 May 2010 08:22:49 +0000 (09:22 +0100)]
Post QResizeEvent from QSymbianControl::SizeChanged even when invisible

Task-number: QTBUG-10986
Reviewed-by: Jason Barron
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Thu, 27 May 2010 13:43:18 +0000 (15:43 +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 regression with Qt::AlignRight on monospaced text in QTextLayout
  Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95f

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, 27 May 2010 11:40:55 +0000 (13: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:
  Added some changes for 4.6.3

7 years agoMoved Symbian-specific .pro directive into symbian{} block
Gareth Stockwell [Thu, 27 May 2010 11:03:22 +0000 (12:03 +0100)]
Moved Symbian-specific .pro directive into symbian{} block

Reviewed-by: Miikka Heikkinen
7 years agoFix regression with Qt::AlignRight on monospaced text in QTextLayout
Eskil Abrahamsen Blomfeldt [Thu, 27 May 2010 11:14:20 +0000 (13:14 +0200)]
Fix regression with Qt::AlignRight on monospaced text in QTextLayout

For monospaced fonts, using the width (including the bearing) of the
text to align it to the right hand side, will break alignment of
columns of characters. To fix the problem, we go back to the old
procedure, by using the advance of the text as basis of alignment
instead.

Done-by: thorbjorn
Reviewed-by: Eskil
7 years agoBack port change d85b149a5c7f3532f8e1a593a79298c9ae38a95f
Eskil Abrahamsen Blomfeldt [Thu, 27 May 2010 10:04:19 +0000 (12:04 +0200)]
Back port change d85b149a5c7f3532f8e1a593a79298c9ae38a95f

Fixes right alignment of monospaced text, which was a regression in
Qt 4.6.0. Initially it was fixed in Qt 4.7 only, but the regression was
later deemed severe enough to fix in 4.6.x as well.

Task-number: QTBUG-8864
Reviewed-by: thorbjorn
7 years agoAdded some changes for 4.6.3
Jens Bache-Wiig [Thu, 27 May 2010 08:53:11 +0000 (10:53 +0200)]
Added some changes for 4.6.3

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Thu, 27 May 2010 08:44:13 +0000 (10:44 +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 compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.

7 years agoFix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.
Liang Qi [Thu, 27 May 2010 08:40:23 +0000 (10:40 +0200)]
Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.

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, 26 May 2010 22:49:47 +0000 (00:49 +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:
  Allow auto-test to compile when using namespaces
  Fix regression in QVarLengthArray::operator=

7 years agoAllow auto-test to compile when using namespaces
João Abecasis [Wed, 26 May 2010 22:39:48 +0000 (00:39 +0200)]
Allow auto-test to compile when using namespaces

Auto-test added in 8060094144d6104659b8ce3b88d6f8b1e53cfb59 does not
compile when using Qt in namespace, because Q_DECLARE_TYPEINFO needs to
be used from inside QT_NAMESPACE.

Wrapper macros added.

Task-number: QTBUG-10978

7 years agoFix regression in QVarLengthArray::operator=
João Abecasis [Wed, 26 May 2010 18:04:57 +0000 (20:04 +0200)]
Fix regression in QVarLengthArray::operator=

There was a serious regression wherei, under certain conditions,
assignment would be treated as an append. This was due to poor tracking
of container invariants inside realloc.

From now on, after the allocation decision, s shall contain the number
of elements in the array to be kept. Deleting extra elements in the old
array needn't update this value. Instead, it needs to be updated once
and if new elements are created afterwards.

Auto-test greatly expanded to avoid future embarassments.

Task-number: QTBUG-10978
Reviewed-by: Olivier Goffart
Reviewed-by: Fabien Freling
Olivier reviewed the patch, Fabien the auto-test.

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, 26 May 2010 15:11:18 +0000 (17:11 +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:
  My 4.6.3 changes

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, 26 May 2010 13:18:47 +0000 (15:18 +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:
  Removed unnecessary PlatSec capabilities from spectrum demo DLL
  Added missing PlatSec capabilities to spectrum demo DLL

7 years agoRemoved unnecessary PlatSec capabilities from spectrum demo DLL
Gareth Stockwell [Wed, 26 May 2010 11:59:03 +0000 (12:59 +0100)]
Removed unnecessary PlatSec capabilities from spectrum demo DLL

Task-number: QTBUG-10964
Reviewed-by: Miikka Heikkinen
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, 26 May 2010 11:20:58 +0000 (13: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:
  Make test work with shadow builds again.

7 years agoMake test work with shadow builds again.
Andreas Aardal Hanssen [Wed, 26 May 2010 11:09:49 +0000 (13:09 +0200)]
Make test work with shadow builds again.

Broken by 0cdf33e9acb00b8f3654e8268253a3fb7c5db92c, which assumes the
binary and sources are in the same directory. The fix reverts the code
back to how it was in 4.5 (where it still works with shadow builds).

Reviewed-by: Denis Dzyubenko
7 years agoAdded missing PlatSec capabilities to spectrum demo DLL
Gareth Stockwell [Wed, 26 May 2010 10:50:53 +0000 (11:50 +0100)]
Added missing PlatSec capabilities to spectrum demo DLL

On Symbian, spectrum.exe has UserEnvironment capability in order to
allow it to use QAudioInput.  This means that the capabilities of
any DLL which it loads must include UserEnvironment.  Prior to this
patch, fftreal.dll was built without any capabilities, causing
startup of the application to fail.

Although granting only UserEnvironment to fftreal.dll would fix the
bug, the usual pattern on Symbian OS is to grant 'all -tcb'
capabilities to DLLs.  The capabilities with which the DLL actually
runs are inherited from its parent process.

Task-number: QTBUG-10964
Reviewed-by: Liang Qi
7 years agoMy 4.6.3 changes
Sami Merila [Wed, 26 May 2010 08:34:14 +0000 (11:34 +0300)]
My 4.6.3 changes

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, 26 May 2010 08:31:31 +0000 (10:31 +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:
  Tidy changes file for 4.6.3.
  My 4.6.3 changes

7 years agoTidy changes file for 4.6.3.
Jason McDonald [Wed, 26 May 2010 07:37:38 +0000 (17:37 +1000)]
Tidy changes file for 4.6.3.

Reviewed-by: Trust Me
7 years agoMy 4.6.3 changes
Miikka Heikkinen [Tue, 25 May 2010 13:52:47 +0000 (16:52 +0300)]
My 4.6.3 changes

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, 26 May 2010 02:49:51 +0000 (04:49 +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:
  My 4.6.3 changes
  Don't use QAtomicInt in statics because they are non-POD.

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, 25 May 2010 23:54:57 +0000 (01:54 +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 the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
  Build fix for spectrum demo when -qtnamespace is used
  Fixed license headers in spectrum demo

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Gareth Stockwell [Tue, 25 May 2010 15:58:33 +0000 (16:58 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

7 years agoMy 4.6.3 changes
Gareth Stockwell [Tue, 25 May 2010 15:58:10 +0000 (16:58 +0100)]
My 4.6.3 changes

7 years agoFix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
Liang Qi [Tue, 25 May 2010 15:49:43 +0000 (17:49 +0200)]
Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.

7 years agoBuild fix for spectrum demo when -qtnamespace is used
Gareth Stockwell [Tue, 25 May 2010 15:33:44 +0000 (16:33 +0100)]
Build fix for spectrum demo when -qtnamespace is used

Task-number: QTBUG-10881
Reviewed-by: Liang Qi
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, 25 May 2010 15:26:11 +0000 (17:26 +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:
  Don't use QAtomicInt in statics because they are non-POD.

7 years agoFixed license headers in spectrum demo
Gareth Stockwell [Fri, 21 May 2010 12:55:26 +0000 (13:55 +0100)]
Fixed license headers in spectrum demo

Reviewed-by: Jason McDonald
Task-number: QTBUG-10887

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, 25 May 2010 12:37:43 +0000 (14:37 +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:
  Qt app draws background incorrectly when animated wallpaper is used

7 years agoQt app draws background incorrectly when animated wallpaper is used
Sami Merila [Tue, 25 May 2010 10:59:08 +0000 (13:59 +0300)]
Qt app draws background incorrectly when animated wallpaper is used

In Symbian^3 OS supports animated wallpapers. Unfortunately animation
is drawn to separate surface underneath the application surface. To
avoid fiddling with system surfaces, Qt apps indicate to the
OS that application does not support animated wallpaper and thus,
system draws a "regular" wallpaper for the application.

This feature is supported only in Sym^3.

Task-number: QT-3148
Reviewed-by: Shane Kearns
7 years agoDon't use QAtomicInt in statics because they are non-POD.
Thiago Macieira [Tue, 25 May 2010 08:24:41 +0000 (10:24 +0200)]
Don't use QAtomicInt in statics because they are non-POD.

Reviewed-By: Olivier Goffart
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, 25 May 2010 09:57:24 +0000 (11: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:
  QTBUG-5955: Qt fails to build on alpha architecture

7 years agoQTBUG-5955: Qt fails to build on alpha architecture
Fathi Boudra [Tue, 25 May 2010 09:52:45 +0000 (11:52 +0200)]
QTBUG-5955: Qt fails to build on alpha architecture
 - add alpha platform support based on JavaScriptCore from src/3rdparty/webkit copy.
 - fix invalid type conversions on alpha architecture.

Merge-request: 640
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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 [Mon, 24 May 2010 19:16:04 +0000 (21:16 +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 a race condition with QtDBus blocking for replies.
  QtDBus: Debug message update

7 years agoFix a race condition with QtDBus blocking for replies.
Thiago Macieira [Tue, 18 May 2010 13:58:24 +0000 (15:58 +0200)]
Fix a race condition with QtDBus blocking for replies.

If an auxiliary thread tried to block on waiting for a reply, and at
the same time the main thread handled the reply, there's room for a
race condition. So ensure only one thread is stopped at
dbus_pending_call_block().

The other thread(s) will be waiting on the QWaitCondition.

It's not a race condition for the main thread to process (and finish
processing) the reply while the auxiliary thread hasn't even started
to wait. The code will ensure that the reply is properly seen.

Task-Id: https://projects.maemo.org/bugzilla/show_bug.cgi?id=155306
Reviewed-By: Trust Me
7 years agoQtDBus: Debug message update
Thiago Macieira [Mon, 24 May 2010 07:21:28 +0000 (09:21 +0200)]
QtDBus: Debug message update

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, 21 May 2010 19:33:16 +0000 (21:33 +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:
  Removed DEPLOYMENT from demos/spectrum/spectrum.pro
  Install source for spectrum demo
  Fixed path for copying launcher script for spectrum demo

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, 21 May 2010 17:34:21 +0000 (19:34 +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 an assert in QMenu
  Call eglTerminate() when the last QEglContext is destroyed to free mem.

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, 21 May 2010 15:25:52 +0000 (17: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:
  My 4.6.3 changes.
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f )
  tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64

7 years agoRemoved DEPLOYMENT from demos/spectrum/spectrum.pro
Gareth Stockwell [Fri, 21 May 2010 10:41:36 +0000 (11:41 +0100)]
Removed DEPLOYMENT from demos/spectrum/spectrum.pro

DEPLOYMENT was added to demos/spectrum/spectrum.pro as a workaround
for QTBUG-5312, in order to allow 'make sis' to be executed from
the demos/spectrum directory.  While this workaround is OK for SBSv2,
it causes a build failure when using SBSv1.

Task-number: QTBUG-10833

7 years agoInstall source for spectrum demo
Gareth Stockwell [Thu, 20 May 2010 11:53:45 +0000 (13:53 +0200)]
Install source for spectrum demo

Task-number: QTBUG-10880
Reviewed-by: Thomas Zander
7 years agoFixed path for copying launcher script for spectrum demo
Gareth Stockwell [Thu, 20 May 2010 11:52:38 +0000 (13:52 +0200)]
Fixed path for copying launcher script for spectrum demo

Task-number: QTBUG-10879
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 [Fri, 21 May 2010 13:27:39 +0000 (15:27 +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:
  Backport multitouch bug fixes to 4.6
  Removed double EINTR loop from nativeWrite and nativeRead.
  Fixed qsslkey test deployment for Symbian and fixed compiler warnings.
  Fixing the race condition in event dispatcher implementation on

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, 21 May 2010 13:08:37 +0000 (15:08 +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 an assert in QMenu
  Call eglTerminate() when the last QEglContext is destroyed to free mem.

7 years agoMy 4.6.3 changes.
Yoann Lopes [Fri, 21 May 2010 13:07:48 +0000 (15:07 +0200)]
My 4.6.3 changes.

7 years agoUpdated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d...
Simon Hausmann [Fri, 21 May 2010 12:51:29 +0000 (14:51 +0200)]
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ecee9d7244ce4f7e7acf723bcef535532780db5f )

Changes in WebKit/qt since the last update:

* [Qt] Nested overflow div does not scroll https://bugs.webkit.org/show_bug.cgi?id=38641
* [Qt] Non animated gifs are animated in QtWebKit https://bugs.webkit.org/show_bug.cgi?id=35955
* [Qt] startAnimation() is not needed to preceede nativeImageForCurrentFrame() https://bugs.webkit.org/show_bug.cgi?id=37844
* Animated GIF images does not animate 10x as expected by default. https://bugs.webkit.org/show_bug.cgi?id=36818

Plus updated/fixed def files

7 years agoFixed an assert in QMenu
Thierry Bastian [Fri, 21 May 2010 12:10:53 +0000 (14:10 +0200)]
Fixed an assert in QMenu

The code was changed and changed the behaviour. This is
basically a kind of revert.

Reviewed-By: gabi
Task-Number: QTBUG-10735

7 years agoBackport multitouch bug fixes to 4.6
Shane Kearns [Fri, 21 May 2010 10:38:20 +0000 (12:38 +0200)]
Backport multitouch bug fixes to 4.6

commit 24b811e53b30546279346ab7b16799be119ab8c4 on 4.7 includes bug
fixes which are needed for 4.6 as well.

1. TouchEnd event was missing
2. pressure in touchpoints was set to 0.0 for non pressure sensitive
   touch screens, it should be set to 1.0 for consistency with existing
   Qt ports (e.g. mac).

Task-number: QTBUG-10885
Reviewed-by: Bradley T. Hughes
7 years agotst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64
Thiago Macieira [Fri, 21 May 2010 11:19:12 +0000 (13:19 +0200)]
tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64

7 years agoCall eglTerminate() when the last QEglContext is destroyed to free mem.
Trond Kjernåsen [Fri, 21 May 2010 11:24:54 +0000 (13:24 +0200)]
Call eglTerminate() when the last QEglContext is destroyed to free mem.

We never called eglTerminate() to free memory allocated by
eglInitialize() since it was a fixed allocation that would be used
for the lifetime of an application. The new behavior is to call
eglTerminate() when the last EGL context in the app is destroyed.

Task-number: QT-3383
Reviewed-by: Rhys Weatherley
7 years agoRemoved double EINTR loop from nativeWrite and nativeRead.
Janne Anttila [Wed, 19 May 2010 11:04:09 +0000 (14:04 +0300)]
Removed double EINTR loop from nativeWrite and nativeRead.

qt_safe_write and and qt_safe_read already contain EINTR_LOOP.
It seems that this loop has been added to code due to
merge/clean-up errors in commits:

4aafbd6222e7aeafd59a4a4356ba8c53b2bfa1d1
f0a8feed9e9b4de10df76faa350201edaef98f1d

Reviewed-by: Aleksandar Sasha Babic
Reviewed-by: Markus Goetz
7 years agoFixed qsslkey test deployment for Symbian and fixed compiler warnings.
Janne Anttila [Wed, 19 May 2010 10:46:47 +0000 (13:46 +0300)]
Fixed qsslkey test deployment for Symbian and fixed compiler warnings.

Reviewed-by: Aleksandar Sasha Babic
7 years agoFixing the race condition in event dispatcher implementation on
Aleksandar Sasha Babic [Fri, 21 May 2010 11:01:00 +0000 (13:01 +0200)]
Fixing the race condition in event dispatcher implementation on
Symbian platform

New socket related requests are comming into QSelectThread by
interrupting the select call by writing to pipe.

One of the criteria is that m_mutex (from QSelectThread) could be
locked, meaninig that QSelectThread is in m_waitCond.wait() call.

However, the m_mutex can be locked by other contenders trying to
post new requests in burst. This would trigger writing to pipe in
false situations, making QSelectThread to hang in waitCond as
no wakeAll will come until some next request (in future) kicks in.

Task-number: QT-3358
Reviewed-by: Janne Anttila
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, 21 May 2010 11:14:47 +0000 (13:14 +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:
  changes-4.6.3 updated

7 years agochanges-4.6.3 updated
Joerg Bornemann [Fri, 21 May 2010 09:29:14 +0000 (11:29 +0200)]
changes-4.6.3 updated

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, 21 May 2010 09:14:27 +0000 (11:14 +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:
  Fixing the compile issue.
  Fixing the compile issue.

7 years agoFixing the compile issue.
Aleksandar Sasha Babic [Fri, 21 May 2010 07:44:51 +0000 (09:44 +0200)]
Fixing the compile issue.

Private headers have to be included in consistent and proper way:
not like "name_p.h" or "../name_p.h" but <private/name_p.h>

7 years agoFixing the compile issue.
Aleksandar Sasha Babic [Fri, 21 May 2010 07:41:19 +0000 (09:41 +0200)]
Fixing the compile issue.

We have to explicitely specify the include path to the MW headers
for Symbian. The compiler always gets confused if the private headers
get in the way.

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 [Fri, 21 May 2010 07:10:21 +0000 (09:10 +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:
  Typo.

7 years agoTypo.
Trond Kjernåsen [Fri, 21 May 2010 07:03:30 +0000 (09:03 +0200)]
Typo.

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, 21 May 2010 04:34:36 +0000 (06:34 +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:
  Removed nearest test from  qaudiodeviceinfo unit test.
  QAudioDeviceInfo::nearestFormat() consistent across all platforms
  The documentation for processedUSecs() is ambiguous

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Kurt Korbatits [Fri, 21 May 2010 03:34:21 +0000 (13:34 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6

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, 20 May 2010 20:14:20 +0000 (22:14 +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:
  QAudioDeviceInfo::nearestFormat() consistent across all platforms
  The documentation for processedUSecs() is ambiguous

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, 20 May 2010 18:18:33 +0000 (20:18 +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:
  My 4.6.3 changes.
  Added my 4.6.3 changes.
  My 4.6.3 changes.

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, 20 May 2010 16:24:26 +0000 (18:24 +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:
  QAudioDeviceInfo::nearestFormat() consistent across all platforms
  The documentation for processedUSecs() is ambiguous

7 years agoMy 4.6.3 changes.
Trond Kjernåsen [Thu, 20 May 2010 16:12:38 +0000 (18:12 +0200)]
My 4.6.3 changes.

7 years agoAdded my 4.6.3 changes.
Kim Motoyoshi Kalland [Thu, 20 May 2010 15:35:27 +0000 (17:35 +0200)]
Added my 4.6.3 changes.

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, 20 May 2010 14:22:50 +0000 (16:22 +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:
  Add my 4.6.3 changes

7 years agoMy 4.6.3 changes.
Samuel Rødal [Thu, 20 May 2010 14:18:45 +0000 (16:18 +0200)]
My 4.6.3 changes.

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, 20 May 2010 12:15:00 +0000 (14:15 +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:
  QAudioDeviceInfo::nearestFormat() consistent across all platforms
  The documentation for processedUSecs() is ambiguous

7 years agoAdd my 4.6.3 changes
Kent Hansen [Thu, 20 May 2010 10:20:05 +0000 (12:20 +0200)]
Add my 4.6.3 changes

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, 20 May 2010 10:14:55 +0000 (12:14 +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 WebKit version dependency in pkg files
  Add support for including module specific .pri files as part of qt.prf handling
  My changelog entries for 4.6.3
  Add my changes to the 4.6.3 changes log
  my changelog for 4.6.3

7 years agoFix WebKit version dependency in pkg files
Simon Hausmann [Thu, 20 May 2010 09:01:46 +0000 (11:01 +0200)]
Fix WebKit version dependency in pkg files

Default to the Qt major/minor/patch version for WebKit, but use them
only if it wasn't specified in mkspecs/modules/qt_webkit.pri, which is
read by qt.prf

Task-number: QTBUG-10847

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
7 years agoAdd support for including module specific .pri files as part of qt.prf handling
Simon Hausmann [Thu, 20 May 2010 08:58:11 +0000 (10:58 +0200)]
Add support for including module specific .pri files as part of qt.prf handling

Task-number: QTBUG-10847

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
7 years agoMy changelog entries for 4.6.3
Denis Dzyubenko [Thu, 20 May 2010 08:58:25 +0000 (10:58 +0200)]
My changelog entries for 4.6.3

Reviewed-by: trustme
7 years agoAdd my changes to the 4.6.3 changes log
Eskil Abrahamsen Blomfeldt [Thu, 20 May 2010 08:49:57 +0000 (10:49 +0200)]
Add my changes to the 4.6.3 changes log

7 years agomy changelog for 4.6.3
Peter Hartmann [Thu, 20 May 2010 08:18:51 +0000 (10:18 +0200)]
my changelog for 4.6.3