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

8 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
8 years agoQtDBus: Debug message update
Thiago Macieira [Mon, 24 May 2010 07:21:28 +0000 (09:21 +0200)]
QtDBus: Debug message update

8 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

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

8 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

8 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

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

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

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

8 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

8 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

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

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

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

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

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

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

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

8 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

8 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

8 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

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

8 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

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

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

8 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

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

8 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

8 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

8 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

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

8 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

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Thu, 20 May 2010 08:13:27 +0000 (10: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:
  Switch Symbian^3 QCursor implementation back to 5.0 way

8 years agoSwitch Symbian^3 QCursor implementation back to 5.0 way
Shane Kearns [Thu, 20 May 2010 08:02:58 +0000 (10:02 +0200)]
Switch Symbian^3 QCursor implementation back to 5.0 way

The window server bug with pointer cursors may not have been fixed, in
any case enabling pointer cursors on Symbian^3 requires WriteSystemData
capability which isn't available to all applications.

This change fixes the "qt_s60_setWindowGroupCursor - null handle"
warnings when using the touch screen.

Tested with QCursor manual test (tst_allcursors)

Reviewed-by: Sami Merila
8 years agoRemoved nearest test from qaudiodeviceinfo unit test.
Kurt Korbatits [Thu, 20 May 2010 04:54:22 +0000 (14:54 +1000)]
Removed nearest test from  qaudiodeviceinfo unit test.

Reviewed-by:Justin McPherson

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Wed, 19 May 2010 05:50:01 +0000 (07:50 +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

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Wed, 19 May 2010 03:55:52 +0000 (05:55 +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 qmake -project once more

8 years agoQAudioDeviceInfo::nearestFormat() consistent across all platforms
Kurt Korbatits [Wed, 19 May 2010 03:36:07 +0000 (13:36 +1000)]
QAudioDeviceInfo::nearestFormat() consistent across all platforms

Task-number:QTBUG-10760
Reviewed-by:Justin McPherson

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6
Kurt Korbatits [Wed, 19 May 2010 02:29:09 +0000 (12:29 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Wed, 19 May 2010 01:46:32 +0000 (03:46 +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:
  Fixed tst_compilerwarnings test failure due to icecc node failures.

8 years agoFixed tst_compilerwarnings test failure due to icecc node failures.
Rohan McGovern [Wed, 19 May 2010 01:35:48 +0000 (11:35 +1000)]
Fixed tst_compilerwarnings test failure due to icecc node failures.

When an icecc node has some system error, icecc on the client side
outputs a warning. Since it's able to recover and the warning has
nothing to do with the code, we should ignore it.

Other distributed compile tools will have similar issues, but no attempt
has been made to cover them.

8 years agoThe documentation for processedUSecs() is ambiguous
Kurt Korbatits [Wed, 19 May 2010 01:10:39 +0000 (11:10 +1000)]
The documentation for processedUSecs() is ambiguous

Task-number:QTBUG-10759
Reviewed-by:Justin McPherson

8 years agofix qmake -project once more
Oswald Buddenhagen [Tue, 18 May 2010 08:59:48 +0000 (10:59 +0200)]
fix qmake -project once more

default_pre.prf adds "uic" and "resources" to CONFIG, but not "qt". as a
consequence, the former do not find qtPrepareTool(), as nobody includes
qt_functions.prf if no qmake spec is loaded.

Reviewed-by: joerg
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Tue, 18 May 2010 09:12:37 +0000 (11:12 +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:
  QNAM HTTP: Remove dead code

8 years agoQNAM HTTP: Remove dead code
Markus Goetz [Tue, 18 May 2010 08:56:29 +0000 (10:56 +0200)]
QNAM HTTP: Remove dead code

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Mon, 17 May 2010 15:59:49 +0000 (17:59 +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: fix typo
  QCompleter: fix misuse of QMap that can lead to crashes
  qmake: added possibility to specify the type of an install target

8 years agoDoc: fix typo
Olivier Goffart [Mon, 17 May 2010 15:47:00 +0000 (17:47 +0200)]
Doc: fix typo

8 years agoQCompleter: fix misuse of QMap that can lead to crashes
Olivier Goffart [Mon, 17 May 2010 15:43:16 +0000 (17:43 +0200)]
QCompleter: fix misuse of QMap that can lead to crashes

Patch providedin the task.

Task-number: QTBUG-8407

8 years agoqmake: added possibility to specify the type of an install target
Joerg Bornemann [Mon, 17 May 2010 14:14:32 +0000 (16:14 +0200)]
qmake: added possibility to specify the type of an install target

Before this change:
target.CONFIG+=no_check_exist implies the file is a file, no way to
make an install rule for a non-existing directory.

Now, its possible to specify the type:
    target.CONFIG+=no_check_exist directory
will install a directory.
    target.CONFIG+=no_check_exist executable
will install an executable.
    target.CONFIG+=no_check_exist data
will install a normal file.

The default case, if no type is given, like in
    CONFIG+=no_check_exist
will call QFileInfo::isExecutable() to determine, if its a data file
or executable. This is the old behaviour.

Task-number: QTBUG-10624
Reviewed-by: ossi
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Mon, 17 May 2010 13:17:14 +0000 (15:17 +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:
  re-add overriding of tool paths to configure

8 years agore-add overriding of tool paths to configure
Oswald Buddenhagen [Mon, 17 May 2010 13:04:11 +0000 (15:04 +0200)]
re-add overriding of tool paths to configure

unlike originally planned, we didn't remove the setting of the tool
paths from the qmake specs - for compat reasons. however, that means
that they will make the QT_BUILD_TREE handling in qtPrepareTool
ineffective, which meant that the qt build would try to use the tools
from an installed qt ...

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Fri, 14 May 2010 20:28:21 +0000 (22:28 +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:
  Support linked fonts (.ltt) from standard font locations.
  QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
  Fix anomaly demo control strip icon placement

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Fri, 14 May 2010 18:30:52 +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:
  Support linked fonts (.ltt) from standard font locations.
  QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
  Fix anomaly demo control strip icon placement

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Fri, 14 May 2010 16:31:33 +0000 (18: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:
  fix regexp
  fix path separators in install targets for MinGW+sh
  fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
  define qtPrepareTool() function and use it throughout
  QNAM HTTP: And one more testcase
  QNetworkAccessManager: Backends were tried in wrong order

8 years agofix regexp
Oswald Buddenhagen [Fri, 14 May 2010 14:58:19 +0000 (16:58 +0200)]
fix regexp

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Fri, 14 May 2010 14:01:31 +0000 (16:01 +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 path separators in install targets for MinGW+sh
  fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
  define qtPrepareTool() function and use it throughout
  QNAM HTTP: And one more testcase
  QNetworkAccessManager: Backends were tried in wrong order

8 years agoSupport linked fonts (.ltt) from standard font locations.
Alessandro Portale [Fri, 14 May 2010 12:55:13 +0000 (14:55 +0200)]
Support linked fonts (.ltt) from standard font locations.

The internal font database was only populated with .ttf and .ccc files.
This patch adds .ltt as file type.

Without complete font type coverage in the fontstore, we may get a
mismatch in the internal association of font table and fontfamily.

Most probably, this will also fix the crash on SSE Satio's. SSE
seems to use .ltt files already on S60 5.0. An improvement needs to be
verified by an owner of such a device, however.

Task-number: QTBUG-8905
Reviewed-by: Aleksandar Sasha Babic
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Fri, 14 May 2010 12:11:04 +0000 (14:11 +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:
  QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
  Fix anomaly demo control strip icon placement

8 years agofix path separators in install targets for MinGW+sh
Joerg Bornemann [Mon, 10 May 2010 15:42:02 +0000 (17:42 +0200)]
fix path separators in install targets for MinGW+sh

Reviewed-by: ossi
8 years agofix QMAKE_QMAKE path separator under mingw+sh in the qmake spec
Oswald Buddenhagen [Thu, 6 May 2010 15:39:30 +0000 (17:39 +0200)]
fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec

this would have been a problem if someone accessed QMAKE_QMAKE from
within a pro file, as that would fix the separators to the native host
platform separator (as QMAKE_DIR_SEP is not processed at that point).

Reviewed-by: joerg
8 years agodefine qtPrepareTool() function and use it throughout
Oswald Buddenhagen [Fri, 14 May 2010 11:42:28 +0000 (13:42 +0200)]
define qtPrepareTool() function and use it throughout

the function provides a cross-platform way to determine the exact
pathname of our build tools (moc, etc.).

use it in our .prf files, so we don't have to rely on qmake's
unreliable path separator normalization magic in extra compiler
commands, which broke on mingw+sh in silent mode.

remove the bootstrap tool path setting from configure, as it is
redundant now.

Reviewed-by: joerg
Task-number: QTBUG-10633

8 years agoQS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike
Sami Merila [Fri, 14 May 2010 11:38:31 +0000 (14:38 +0300)]
QS60Style: In S60 3.x and 5.0 Qt itemviews behaviour is not nativelike

Currently style defines QStyle::SH_ItemView_ActivateItemOnSingleClick,
which leads to itemview item activation only occur on double-click
(or tap). The item selection work native-like on Sym^3.

As a correction, style needs to check the passed styleoption and
check whether or not the state "Selected" is on. In these cases,
the itemactivation can proceed.

Task-number: QTBUG-10697
Reviewed-by: Miikka Heikkinen
8 years agoQNAM HTTP: And one more testcase
Markus Goetz [Fri, 14 May 2010 11:21:56 +0000 (13:21 +0200)]
QNAM HTTP: And one more testcase

8 years agoQNetworkAccessManager: Backends were tried in wrong order
Markus Goetz [Fri, 14 May 2010 10:41:07 +0000 (12:41 +0200)]
QNetworkAccessManager: Backends were tried in wrong order

We inversed the order. HTTP shall be tried first, file:// last.

See https://bugs.webkit.org/show_bug.cgi?id=38935

Reviewed-by: Thiago
8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Fri, 14 May 2010 10:16:27 +0000 (12: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 QUrl::isValid if the host contains invalid caracter.
  QUrl: parsing of host name with an undercore.

8 years agoFix QUrl::isValid if the host contains invalid caracter.
Olivier Goffart [Fri, 14 May 2010 08:35:33 +0000 (10:35 +0200)]
Fix QUrl::isValid if the host contains invalid caracter.

If the host contains invalid caracter, QUrl::isValid should return false

Task-number: QTBUG-10355
Reviewed-by: thiago
8 years agoFix anomaly demo control strip icon placement
Miikka Heikkinen [Fri, 14 May 2010 09:59:55 +0000 (12:59 +0300)]
Fix anomaly demo control strip icon placement

Some icons overlapped in very small screens, so make icon placement
little bit smarter.

Task-number: QTBUG-10635
Reviewed-by: Janne Anttila
8 years agoQUrl: parsing of host name with an undercore.
Olivier Goffart [Mon, 26 Apr 2010 13:16:34 +0000 (15:16 +0200)]
QUrl: parsing of host name with an undercore.

This is not supposed to be allowed, but it work with other browsers

Rask-number: QTBUG-7434
Reviewed-by: Thiago
Reviewed-by: Markus Goetz
(cherry picked from commit a8065da96b96fcc4baeca7615c2a4195c05cbc03)

8 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Fri, 14 May 2010 01:38:37 +0000 (03:38 +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:
  Fixed race condition compiling xmlpatterns tests.
  Remove qdbusserver from tests/auto/dbus.pro
  Remove garbage test.