qt:digia-qt.git
6 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 4.6
Qt Continuous Integration System [Mon, 17 Jan 2011 15:39:39 +0000 (01:39 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fixed unescaped backslashes in testcase.prf
  Fix `make check' for debug-and-release on Windows.
  Move `check' target for autotests into testcase.prf
  Revert "Backporting TESTARGS feature from 4.7"

6 years agoFixed unescaped backslashes in testcase.prf
Rohan McGovern [Fri, 4 Jun 2010 07:08:37 +0000 (17:08 +1000)]
Fixed unescaped backslashes in testcase.prf

(cherry picked from commit c5beba29f1ac44ce225d73da67503f23f8aeffdc)

6 years agoFix `make check' for debug-and-release on Windows.
Rohan McGovern [Mon, 31 May 2010 00:22:24 +0000 (10:22 +1000)]
Fix `make check' for debug-and-release on Windows.

(cherry picked from commit 012a777ecec0ca74cf95683f069cb79774b7093a)

6 years agoMove `check' target for autotests into testcase.prf
Rohan McGovern [Sat, 22 May 2010 07:54:33 +0000 (17:54 +1000)]
Move `check' target for autotests into testcase.prf

testcase.prf is installed, thus allowing `make check' to work
outside of the Qt source tree.
(cherry picked from commit d29e1dda8fbc24087b9cf0bf08d929bef74f5c96)

6 years agoRevert "Backporting TESTARGS feature from 4.7"
João Abecasis [Mon, 17 Jan 2011 15:17:48 +0000 (16:17 +0100)]
Revert "Backporting TESTARGS feature from 4.7"

This reverts commit 0336bc0cc8b4c0b0e75315594c1db83ee9b30f2e.

6 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Qt Continuous Integration System [Wed, 12 Jan 2011 13:08:15 +0000 (23:08 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Backporting TESTARGS feature from 4.7

6 years agoBackporting TESTARGS feature from 4.7
João Abecasis [Wed, 12 Jan 2011 12:43:08 +0000 (13:43 +0100)]
Backporting TESTARGS feature from 4.7

Originally introduced in d29e1dda8fbc24087b9cf0bf08d929bef74f5c96.

This patch should be reverted when it reaches the 4.7 branch again.

Reviewed-by: Sergio Ahumada
6 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Qt Continuous Integration System [Wed, 12 Jan 2011 03:14:36 +0000 (13:14 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Update copyright year to 2011.

6 years agoUpdate copyright year to 2011.
Jason McDonald [Mon, 10 Jan 2011 15:15:00 +0000 (01:15 +1000)]
Update copyright year to 2011.

Reviewed-by: Trust Me
6 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1
Qt Continuous Integration System [Mon, 20 Dec 2010 04:23:26 +0000 (14:23 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  embed copyright information in QtAssistantClient4.dll

6 years agoembed copyright information in QtAssistantClient4.dll
Joerg Bornemann [Fri, 17 Dec 2010 08:38:10 +0000 (09:38 +0100)]
embed copyright information in QtAssistantClient4.dll

Task-number: QT-4054
Reviewed-by: Christian Kandeler
6 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
Qt Continuous Integration System [Fri, 26 Nov 2010 10:18:14 +0000 (11:18 +0100)]
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:
  QLocalSocket/Win: do not emit error() when no error actually occurred
  Doc: fix typo

6 years agoQLocalSocket/Win: do not emit error() when no error actually occurred
Jonathan Liu [Fri, 26 Nov 2010 09:20:56 +0000 (10:20 +0100)]
QLocalSocket/Win: do not emit error() when no error actually occurred

This fixes a regression in 4d0c4b9f09b35d707d437611519d0024f6f87a8c.
Previously the error string was set if the error is not
ERROR_PIPE_NOT_CONNECTED but the commit changed this behaviour to set
the error string if it is ERROR_PIPE_NOT_CONNECTED.

Task-number: QTBUG-13646
Merge-request: 941
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
6 years agoDoc: fix typo
Joerg Bornemann [Fri, 22 Oct 2010 12:13:56 +0000 (14:13 +0200)]
Doc: fix typo

Reviewed-by: mauricek
6 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Wed, 24 Nov 2010 09:12:00 +0000 (10:12 +0100)]
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:
  Fix compliation of ALSA audio backend when checking for surround support.

6 years agoFix compliation of ALSA audio backend when checking for surround support.
Justin McPherson [Wed, 24 Nov 2010 00:45:53 +0000 (10:45 +1000)]
Fix compliation of ALSA audio backend when checking for surround support.

Surround support requires ALSA lib >= 1.0.14

Task-number: QTBUG-15205
Reviewed-by: Andrew den Exter
6 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration 4.6-stable
Qt Continuous Integration System [Mon, 22 Nov 2010 07:06:10 +0000 (08:06 +0100)]
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 handling of QInputMethodEvents with nonzero replacementLength.

6 years agoFixed handling of QInputMethodEvents with nonzero replacementLength.
axis [Fri, 19 Nov 2010 10:15:55 +0000 (11:15 +0100)]
Fixed handling of QInputMethodEvents with nonzero replacementLength.

These types of events replace text that is already in the widget, but
WebKit did not check for replacementLength at all.

RevBy:    Janne Koskinen
Task:     QT-4303
Task:     https://bugs.webkit.org/show_bug.cgi?id=49787
AutoTest: Included

6 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
Qt Continuous Integration System [Wed, 27 Oct 2010 11:01:42 +0000 (13:01 +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 Windows compilation.
  Fixed race condition in raster paint engine.

6 years agoFix Windows compilation.
Samuel Rødal [Wed, 27 Oct 2010 10:57:42 +0000 (12:57 +0200)]
Fix Windows compilation.

Don't take for granted that these are included...

Task-number: QTBUG-14614
Reviewed-by: Bradley T. Hughes
6 years agoFixed race condition in raster paint engine.
Samuel Rødal [Tue, 26 Oct 2010 13:46:11 +0000 (15:46 +0200)]
Fixed race condition in raster paint engine.

We need to protect the gradient cache accesses with a mutex.

Task-number: QTBUG-14614
Reviewed-by: Bradley T. Hughes
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, 13 Oct 2010 01:49:54 +0000 (03:49 +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:
  Demo Spectrum wav data size is not calculated correctly

7 years agoDemo Spectrum wav data size is not calculated correctly
Justin McPherson [Wed, 13 Oct 2010 01:43:25 +0000 (11:43 +1000)]
Demo Spectrum wav data size is not calculated correctly

- Grab length of audio data from Data chunk size
- Read from the device no greater than the audio Data chunk size

Task-number: QTBUG-13779
Reviewed-by: Andrew den Exter
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, 12 Oct 2010 14:35:18 +0000 (16: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:
  Rename .pro file to match directory name.

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, 12 Oct 2010 11:00:27 +0000 (13:00 +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:
  Revert "Don't define highp/mediump/lowp if desktop GL has them"

7 years agoRevert "Don't define highp/mediump/lowp if desktop GL has them"
Trond Kjernåsen [Tue, 12 Oct 2010 10:54:15 +0000 (12:54 +0200)]
Revert "Don't define highp/mediump/lowp if desktop GL has them"

This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd.
The GL_ARB_ES2_compatibility extension does not mention the lowp,
mediump or highp keywords.

Task-number: QTBUG-14384
Reviewed-by: Samuel
Reviewed-by: Prasanth
7 years agoRename .pro file to match directory name.
Jason McDonald [Tue, 12 Oct 2010 03:31:44 +0000 (13:31 +1000)]
Rename .pro file to match directory name.

Task-number: none
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 [Mon, 11 Oct 2010 02:10:41 +0000 (04:10 +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:
  Add header guards to audio example headers.

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Sun, 10 Oct 2010 23:56:39 +0000 (01:56 +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:
  Add header guards to audio example headers.

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, 10 Oct 2010 22:00:56 +0000 (00:00 +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:
  Doc: Fixed qdoc warning.

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
Qt Continuous Integration System [Sun, 10 Oct 2010 19:44:01 +0000 (21: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:
  Added qmake check for presence of RHttpDownloadMgr header
  qmediaplayer: show buffer status of 0%
  Progressive download in Phonon MMF backend: integrated with player
  Progressive download in Phonon MMF backend: added download managers

7 years agoDoc: Fixed qdoc warning.
David Boddie [Fri, 8 Oct 2010 15:05:27 +0000 (17:05 +0200)]
Doc: Fixed qdoc warning.

Reviewed-by: hjk
7 years agoAdded qmake check for presence of RHttpDownloadMgr header
Gareth Stockwell [Sun, 3 Oct 2010 18:43:29 +0000 (19:43 +0100)]
Added qmake check for presence of RHttpDownloadMgr header

downloadmgrclient.h is not found on S^4 baselines, causing a build
failure.  This commit is a temporary workaround, which disables
progressive download support if the header is not found.

The correct solution is to determine whether the RHttpDownloadMgr
definition has moved, and if so, to modify the .pro file to
include the new path.

Task-number: QTBUG-10769
Reviewed-by: TrustMe
7 years agoqmediaplayer: show buffer status of 0%
Gareth Stockwell [Mon, 27 Sep 2010 17:07:35 +0000 (18:07 +0100)]
qmediaplayer: show buffer status of 0%

During progressive download, it is not possible for the Symbian MMF Phonon
backend to determine the buffering status, so it returns a value of 0%.

This change causes qmediaplayer to display this value in the UI, thereby
giving a visible notification of buffering during progressive download.

Task-number: QTBUG-10769
Reviewed-by: Derick Hawcroft
7 years agoProgressive download in Phonon MMF backend: integrated with player
Gareth Stockwell [Tue, 28 Sep 2010 10:05:41 +0000 (11:05 +0100)]
Progressive download in Phonon MMF backend: integrated with player

This commit integrates the Download class with the media playback
classes in the backend, to implement Progressive Download.

Note that this PDL implementation has one drawback: when video
playback is paused due to shortage of data (i.e. due to the download
being temporarily stalled), the display goes black.  This is because,
when the end of the currently-downloaded data is reached, the
playback session is closed.  When more data becomes available, the
clip is re-opened, a seek is done to reach the previous playback
position, and playback is re-started.  Closing the playback session
closes the video stack's connection to the display, thereby causing
the video widget to go black while more data is buffered.

This is a consequence of the level in the native video stack at which
the Phonon integration is done: managing a network stall without
requiring the playback session to be closed would require integration
below the MMF client API, specifically at the MMF controller level.

Task-number: QTBUG-10769
Reviewed-by: Derick Hawcroft
7 years agoProgressive download in Phonon MMF backend: added download managers
Gareth Stockwell [Tue, 28 Sep 2010 10:01:20 +0000 (11:01 +0100)]
Progressive download in Phonon MMF backend: added download managers

This patch adds a Download class which uses the RHttpDownloadMgr
API to download a media clip over HTTP.

Task-number: QTBUG-10769
Reviewed-by: Derick Hawcroft
7 years agoAdd header guards to audio example headers.
Justin McPherson [Fri, 8 Oct 2010 05:37:05 +0000 (15:37 +1000)]
Add header guards to audio example headers.

Task-number: QTBUG-13413
Reviewed-by: Andrew den Exter
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, 7 Oct 2010 08:48:32 +0000 (10:48 +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 build with cups 1.5 snapshots

7 years agoFix build with cups 1.5 snapshots
Bernhard Rosenkraenzer [Thu, 7 Oct 2010 08:33:05 +0000 (10:33 +0200)]
Fix build with cups 1.5 snapshots

Without this patch, Qt CUPS support fails to build with current
CUPS snapshots:

In file included from ../../include/QtGui/private/qcups_p.h:1:0,
                 from painting/qpdf.cpp:47:
.../qcups_p.h:78:11: error: 'ppd_file_t' does not name a type
.../qcups_p.h:80:11: error: 'ppd_file_t' does not name a type
.../qcups_p.h:81:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:84:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:87:34: error: ISO C++ forbids declaration of 'type
                            name' with no type
.../qcups_p.h:87:47: error: template argument 1 is invalid
.../qcups_p.h:103:56: error: 'ppd_group_t' does not name a type
.../qcups_p.h:103:77: error: ISO C++ forbids declaration of 'group'
                      with no type
.../qcups_p.h:104:62: error: 'ppd_group_t' does not name a type
.../qcups_p.h:104:75: error: ISO C++ forbids declaration of 'group'
                      with no type
.../qcups_p.h:108:11: error: 'ppd_option_t' does not name a type
.../qcups_p.h:110:5: error: 'ppd_file_t' does not name a type

Merge-request: 835
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
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, 30 Sep 2010 23:28:55 +0000 (01:28 +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:
  Build fix for -qtnamespace.

7 years agoBuild fix for -qtnamespace.
Leandro Melo [Thu, 30 Sep 2010 09:43:10 +0000 (11:43 +0200)]
Build fix for -qtnamespace.

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

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, 23 Sep 2010 06:17:19 +0000 (08:17 +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:
  Fix compile failure in QtMultimedia.
  Verify the audio format before trying to open an audio device.

7 years agoFix compile failure in QtMultimedia.
Andrew den Exter [Wed, 22 Sep 2010 23:54:03 +0000 (09:54 +1000)]
Fix compile failure in QtMultimedia.

QAudioFormat::sampleRate() and QAudioFormat::channelCount() weren't
introduced until 4.7.  Use frequency() and channels() instead.

Reviewed-by: Justin McPherson
7 years agoVerify the audio format before trying to open an audio device.
Andrew den Exter [Wed, 22 Sep 2010 05:41:34 +0000 (15:41 +1000)]
Verify the audio format before trying to open an audio device.

This was causing a crash on windows because the buffer and period sizes
were worked out to 0 with an invalid sample size and dividing one by the
other is division by 0.

Task-number: QTMOBILITY-438
Reviewed-by: Justin McPherson
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, 17 Sep 2010 13:02:51 +0000 (15:02 +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:
  Implement QAudioInput::suspend() using CMMFDevSound::Stop()
  Discard buffer pointer when DevSound is stopped
  Suppress overflow errors raised by Symbian DevSound during playback
  Discard empty buffer on call to QAudioOutput::resume()
  Permit QAudioOutput::processedUSecs() to be called immediately after start()
  Discard all DevSound buffers held when QAudioInput::suspend() called
  Fixed buffer overrun in Symbian QAudioInput backend

7 years agoImplement QAudioInput::suspend() using CMMFDevSound::Stop()
Gareth Stockwell [Tue, 14 Sep 2010 14:02:03 +0000 (15:02 +0100)]
Implement QAudioInput::suspend() using CMMFDevSound::Stop()

As with playback mode, lack of support for CMMFDevSound::Pause() in
DevSound's recording mode causes problems on some devices.
Specifically, while QAudioInput works fine on the Nokia 5800, this
bug was observed on the Nokia N8.  This fix means that suspending
and resuming audio input will work correctly on all devices.

Task-number: QTBUG-13506
Reviewed-by: Derick Hawcroft
7 years agoDiscard buffer pointer when DevSound is stopped
Gareth Stockwell [Wed, 8 Sep 2010 14:18:06 +0000 (15:18 +0100)]
Discard buffer pointer when DevSound is stopped

Task-number: QTBUG-13504
Reviewed-by: Derick Hawcroft
7 years agoSuppress overflow errors raised by Symbian DevSound during playback
Gareth Stockwell [Wed, 1 Sep 2010 12:52:46 +0000 (13:52 +0100)]
Suppress overflow errors raised by Symbian DevSound during playback

When QAudioOutput::suspend() and QAudioOutput::resume() are called
repeatedly, with a short delay between each call, DevSound occasionally
raises a KErrOverflow error.  The backend previously translated this
into QAudio::IOError, causing the object to transition into the
QAudio::Stopped state.

This error can be safely ignored, with playback resuming as soon as
more audio data is provided to DevSound.  This patch therefore
suppresses the error.

Task-number: QTBUG-13059
Reviewed-by: Derick Hawcroft
7 years agoDiscard empty buffer on call to QAudioOutput::resume()
Gareth Stockwell [Wed, 1 Sep 2010 12:49:54 +0000 (13:49 +0100)]
Discard empty buffer on call to QAudioOutput::resume()

The Symbian backend holds buffers which are passed to it from DevSound,
exposing the memory of these buffers via the QIODevice interface.

When QAudioOutput::resume() is called, the backend re-starts data flow
by passing the buffer it holds back to DevSound.  Previously, this
would not happen if the buffer was empty, potentially causing playback
to stall.  This patch ensures that the buffer is always sent back to
DevSound, and data flow therefore always resumes.

Task-number: QTBUG-13059
Reviewed-by: Derick Hawcroft
7 years agoPermit QAudioOutput::processedUSecs() to be called immediately after start()
Gareth Stockwell [Wed, 1 Sep 2010 12:47:16 +0000 (13:47 +0100)]
Permit QAudioOutput::processedUSecs() to be called immediately after start()

If QAudioOutput::processedUSecs() is called very soon after
QAudioOutput::start(), the DevSound instance owned by the Symbian
backend may still be initializing.  This patch causes the function to
return zero, rather than failing an assertion.

Task-number: QTBUG-13059
Reviewed-by: Derick Hawcroft
7 years agoDiscard all DevSound buffers held when QAudioInput::suspend() called
Gareth Stockwell [Wed, 8 Sep 2010 12:41:54 +0000 (13:41 +0100)]
Discard all DevSound buffers held when QAudioInput::suspend() called

Resuming recording causes buffers previously provided to the client
(via MDevSoundObserver::BufferToBeEmptied()) to be invalidated.
The buffers therefore must be discarded when recording is suspended.

Task-number: QTBUG-13058
Reviewed-by: Derick Hawcroft
7 years agoFixed buffer overrun in Symbian QAudioInput backend
Gareth Stockwell [Wed, 1 Sep 2010 13:04:10 +0000 (14:04 +0100)]
Fixed buffer overrun in Symbian QAudioInput backend

Task-number: QTBUG-13058
Reviewed-by: Derick Hawcroft
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, 15 Sep 2010 00:56:37 +0000 (02:56 +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:
  Prevent crash in QGLGlyphCache due to dangling context references.

7 years agoPrevent crash in QGLGlyphCache due to dangling context references.
Samuel Rødal [Tue, 14 Sep 2010 12:18:27 +0000 (14:18 +0200)]
Prevent crash in QGLGlyphCache due to dangling context references.

We need to clear the context from the cache when it's destroyed even if
it doesn't belong to a widget.

Task-number: QTBUG-13622
Reviewed-by: Trond
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, 10 Sep 2010 10:00:09 +0000 (12:00 +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 crash in input methods when using symbols menu and numbers only

7 years agoFixed crash in input methods when using symbols menu and numbers only
axis [Thu, 9 Sep 2010 11:48:58 +0000 (13:48 +0200)]
Fixed crash in input methods when using symbols menu and numbers only

When inputting only numbers, the symbol menu should not do anything.
However in the old code the resource id of the symbol table was still
being set, so the symbol key on N97 would look up a table that was
not valid for the current input mode and crash.

Fixed by setting the symbol table id to zero under those conditions.

RevBy:    Sami Merila
Task:     QTBUG-13472
AutoTest: Included
(cherry picked from commit 5cef786a651c675d3428060a19bfd9d9ecee6083)

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, 6 Sep 2010 12:34:06 +0000 (14: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:
  Add missing license header
  Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.
  Compile fix WinCE
  Ensure that we load system libraries from the correct location.

7 years agoAdd missing license header
Jan-Arve Sæther [Mon, 6 Sep 2010 10:36:36 +0000 (12:36 +0200)]
Add missing license header

Task-number: QT-3825

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, 6 Sep 2010 09:57:00 +0000 (11: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:
  Fixed input context trying to squeeze content into a full widget.
  Cleaned up position tracking in the Symbian input methods.
  Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"

7 years agoFixed input context trying to squeeze content into a full widget.
axis [Wed, 1 Sep 2010 11:53:32 +0000 (13:53 +0200)]
Fixed input context trying to squeeze content into a full widget.

Problem was reproduced on N97. If the FEP detects that the widget is
full while still editing text, it will try to send those events as
key events instead. Since this screws up the content in the widget,
we stop those events from reaching the widget in the input context.

AutoTest: Passed
Task:     QTBUG-12949
RevBy:    Miikka Heikkinen
(cherry picked from commit 5ca6264933af60b3cd376b7f08bea008fa69b515)

7 years agoCleaned up position tracking in the Symbian input methods.
axis [Tue, 31 Aug 2010 11:15:28 +0000 (13:15 +0200)]
Cleaned up position tracking in the Symbian input methods.

This fixed a case where using password mode would lead to Qt
believing that the cursor was one step to the left of where it really
was. This would have the effect of replacing the last character
instead of appending to it, and even crashing if the cursor was all
the way to the left.

The code is also much cleaner this way, but it meant that QTBUG-9867
had to be solved differently this time. We do this by assuming that
and empty FEP update means "erase last character", which seems to
work well in practice.

Also added a long overdue autotest for the FEP input methods. Most
tests pass, but some don't, which I will try to fix later.

Task:     QTBUG-9867
Task:     QTBUG-12949
RevBy:    Miikka Heikkinen
AutoTest: Included
(cherry picked from commit 52cf47565e402dc682038ccaf8d725401802b603)

7 years agoRevert "Long-press shortcuts for symbols on QWERTY keyboard don't work"
axis [Fri, 27 Aug 2010 08:31:39 +0000 (10:31 +0200)]
Revert "Long-press shortcuts for symbols on QWERTY keyboard don't work"

This reverts commit 05eacd9ad40f8adb5aaa12a8b90113a73b43f642.

Conflicts:

src/gui/inputmethod/qcoefepinputcontext_p.h
src/gui/inputmethod/qcoefepinputcontext_s60.cpp
(cherry picked from commit c5901037f0d3ccd45b0c79b38ef5b04552dad0aa)

7 years agoCompile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.
Jan-Arve Sæther [Mon, 6 Sep 2010 06:23:42 +0000 (08:23 +0200)]
Compile fix MinGW, 5738dcd705e7edde816940f9c0ab2c364c81ad20 broke it.

Task-number: QT-3825

7 years agoCompile fix WinCE
Jan-Arve Sæther [Fri, 3 Sep 2010 12:26:41 +0000 (14:26 +0200)]
Compile fix WinCE

Task-number: QT-3825

7 years agoEnsure that we load system libraries from the correct location.
Jan-Arve Sæther [Tue, 31 Aug 2010 08:23:30 +0000 (10:23 +0200)]
Ensure that we load system libraries from the correct location.

This was a security hole that has been there for a while, but the
public awareness have recently rised so the threat is more imminent
now.

The solution is to fix all places where we dynamically load system
libraries. More specifically, we now load all system libraries with
an absolute path that points to a library in the system directory
(usually c:\windows\system32).

We therefore introduce a small class named QSystemLibrary that only loads
libraries located in the system path. This shares some of the API with
QLibrary (in order to make the patch as small as possible).

We don't fix QLibrary due to risk of regressions. In
addition, applications can fix the code that calls QLibrary themselves.

The problem does not apply to Windows CE, since the search order is
documented as not searching in the current directory.

However, it touches some CE-specific code - therefore QSystemLibrary
is sometimes used on WinCE (however, it will just do a normal
LoadLibrary() since its safe anyway).

This change does not affect the testability plugin (it is not clearly
documented where that plugin is located, and the plugin should never
be used in production code anyway)

Loading OpenSSL libraries
The ssl libraries are handled specially, and searched in this order
(we cannot expect them to always be in the system folder):
1. Application path
2. System libraries path
3. Trying all paths inside the PATH environment variable

Task-number: QT-3825
Reviewed-by: Thiago Macieira
Reviewed-by: Peter Hartmann
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, 1 Sep 2010 01:58:46 +0000 (03:58 +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:
  Some small Solaris fixes.

7 years agoSome small Solaris fixes.
Pierre Rossi [Fri, 20 Aug 2010 15:52:36 +0000 (17:52 +0200)]
Some small Solaris fixes.

Sets the arch properly for solaris-cc-64-stlport on x86_64.
This patch also removes three redundant lines in configure and disables
qtconcurrent examples when it's not available.

Reviewed-by: Thiago
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, 31 Aug 2010 09:28:20 +0000 (11:28 +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 QtScript Date <--> QDateTime (local time) conversion

7 years agoFix QtScript Date <--> QDateTime (local time) conversion
Kent Hansen [Tue, 31 Aug 2010 09:15:30 +0000 (11:15 +0200)]
Fix QtScript Date <--> QDateTime (local time) conversion

This has already been fixed in 4.7 (QTBUG-9770), but the change is
too big to backport.
The general idea is the same: Only operate on UTC dates internally
(since that's how JS dates are stored), and let QDateTime take care
of converting from/to local dates as necessary.

The fix itself shouldn't be merged to 4.7, but the autotests should.

Task-number: QTBUG-9770
Reviewed-by: Jedrzej Nowacki
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, 30 Aug 2010 13:07:56 +0000 (15:07 +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 Qt applications freezing until mouse/keyboard events occur.

7 years agoFix Qt applications freezing until mouse/keyboard events occur.
Bradley T. Hughes [Mon, 30 Aug 2010 12:57:06 +0000 (14:57 +0200)]
Fix Qt applications freezing until mouse/keyboard events occur.

While the qt_GetMessageHook() is executing, GetQueueStatus() reports
that there are timer messages in the queue, but these are never actually
seen by the hook. Calling PeekMessage() will never return these messages
(which is what we really want to know), so don't use GetQueueStatus()
with QS_TIMER.

Task-number: QTBUG-12721
Reviewed-by: denis
Reviewed-by: joao
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, 27 Aug 2010 05:53:51 +0000 (07: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:
  Recognize GL_ARB_shader_objects as indicating shaders

7 years agoRecognize GL_ARB_shader_objects as indicating shaders
Rhys Weatherley [Fri, 27 Aug 2010 05:48:36 +0000 (15:48 +1000)]
Recognize GL_ARB_shader_objects as indicating shaders

Fixes a regression introduced by bf5c25c4.  Some OpenGL
implementations don't have the GL_ARB_fragment_shader extension
listed even though they do support shaders.

Task-number: QTBUG-13179
Reviewed-by: Sarah Smith
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, 25 Aug 2010 09:03:25 +0000 (11:03 +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:
  WGL_COLOR_BITS_ARB should not take the alpha bits into account.

7 years agoWGL_COLOR_BITS_ARB should not take the alpha bits into account.
Trond Kjernåsen [Wed, 25 Aug 2010 08:53:06 +0000 (10:53 +0200)]
WGL_COLOR_BITS_ARB should not take the alpha bits into account.

The WGL_COLOR_BITS_ARB attribute is only supposed to specify the number
of color bits in each buffer, *excluding* the alpha bits.

Task-number: QTBUG-13141
Reviewed-by: Samuel
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, 24 Aug 2010 07:51:33 +0000 (09: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:
  QNAM HTTP: Prepare a compression auto test related to a future bugfix

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, 24 Aug 2010 05:26:21 +0000 (07:26 +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 the broken unicode detection of ODBC driver.

7 years agoFix the broken unicode detection of ODBC driver.
Charles Yin [Tue, 24 Aug 2010 05:15:29 +0000 (15:15 +1000)]
Fix the broken unicode detection of ODBC driver.
the unicode flag is entirely overrided by mistake.

Task-number:QTBUG-13109
Reviewed-by:Michael Goddard

7 years agoQNAM HTTP: Prepare a compression auto test related to a future bugfix
Markus Goetz [Mon, 23 Aug 2010 14:49:08 +0000 (16:49 +0200)]
QNAM HTTP: Prepare a compression auto test related to a future bugfix

Task-number: QTBUG-12908

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, 20 Aug 2010 15:41:02 +0000 (17:41 +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 Norwegian Breakfast Network warnings in configure
  fix shadow build of configure.exe

7 years agofix Norwegian Breakfast Network warnings in configure
Joerg Bornemann [Fri, 20 Aug 2010 15:05:01 +0000 (17:05 +0200)]
fix Norwegian Breakfast Network warnings in configure

Reviewed-by: ossi
7 years agofix shadow build of configure.exe
Joerg Bornemann [Fri, 20 Aug 2010 15:04:23 +0000 (17:04 +0200)]
fix shadow build of configure.exe

Reviewed-by: ossi
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, 18 Aug 2010 22:36:15 +0000 (00:36 +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 epic fail from 4ba6646

7 years agofix epic fail from 4ba6646
Joerg Bornemann [Wed, 18 Aug 2010 12:05:55 +0000 (14:05 +0200)]
fix epic fail from 4ba6646

Reviewed-by: ossi
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, 17 Aug 2010 14:19:47 +0000 (16:19 +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:
  qmake: fix assertion on Windows when DESTDIR is empty in static libs

7 years agoqmake: fix assertion on Windows when DESTDIR is empty in static libs
Joerg Bornemann [Tue, 17 Aug 2010 14:00:17 +0000 (16:00 +0200)]
qmake: fix assertion on Windows when DESTDIR is empty in static libs

Basically replacing project->values("foo").first() with
project->first("foo") which does a null check.

Task-number: QTBUG-12851
Reviewed-by: ossi
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, 16 Aug 2010 07:46:08 +0000 (09:46 +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 OpenGLVersionFlags on OpenGL 4.0 systems

7 years agoFix OpenGLVersionFlags on OpenGL 4.0 systems
Rhys Weatherley [Mon, 16 Aug 2010 02:19:06 +0000 (12:19 +1000)]
Fix OpenGLVersionFlags on OpenGL 4.0 systems

If the OpenGL version was 4.0 or higher, the flags for 1.1, 1.5, 2.0,
and so on were not being set.  This lead to the flags indicating that
older OpenGL versions were not supported when they clearly were.

Back port parts of 28659c21d12a267b10e5b441bf4c776e04d69bdc from Qt 4.7
to fix this in Qt 4.6.

Task-number: QTBUG-12554
Reviewed-by: Sarah Smith
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, 13 Aug 2010 04:21:21 +0000 (06:21 +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:
  Update changes-4.6.4 with recent shader program changes

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, 13 Aug 2010 02:17:41 +0000 (04:17 +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:
  Don't define highp/mediump/lowp if desktop GL has them

7 years agoUpdate changes-4.6.4 with recent shader program changes
Rhys Weatherley [Fri, 13 Aug 2010 01:25:55 +0000 (11:25 +1000)]
Update changes-4.6.4 with recent shader program changes

7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Rhys Weatherley [Fri, 13 Aug 2010 01:13:40 +0000 (11:13 +1000)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6

7 years agoDon't define highp/mediump/lowp if desktop GL has them
Rhys Weatherley [Fri, 13 Aug 2010 00:50:31 +0000 (10:50 +1000)]
Don't define highp/mediump/lowp if desktop GL has them

OpenGL 4.0 systems now have compatibility with ES2, including
support for the precision qualifiers.  If the GL_ARB_ES2_compatibility
extension is present, then we don't define highp/mediump/lowp
to the empty string.

Task-number: QTBUG-12862
Reviewed-by: Sarah Smith
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, 12 Aug 2010 23:46:50 +0000 (01:46 +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: Fix crash related to aborted uploads

7 years agoQNAM HTTP: Fix crash related to aborted uploads
Markus Goetz [Thu, 12 Aug 2010 15:29:29 +0000 (17:29 +0200)]
QNAM HTTP: Fix crash related to aborted uploads

Task-number: QTBUG-12285

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, 12 Aug 2010 07:25:01 +0000 (09:25 +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:
  QAudioOutput(ALSA); Fix check for available devices.

7 years agoQAudioOutput(ALSA); Fix check for available devices.
Justin McPherson [Thu, 12 Aug 2010 06:32:11 +0000 (16:32 +1000)]
QAudioOutput(ALSA); Fix check for available devices.

ALSA can return a list of one empty item when no devices are available.

Task-number: QTBUG-12690
Reviewed-by: Andrew den Exter
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, 11 Aug 2010 02:02:02 +0000 (04:02 +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:
  QSslSocket: fix security vulnerability with wildcard IP addresses
  fix build for -no-qt3support
  Fix handling of SSL certificates with wildcard domain names

7 years agoQSslSocket: fix security vulnerability with wildcard IP addresses
Peter Hartmann [Tue, 10 Aug 2010 11:59:57 +0000 (13:59 +0200)]
QSslSocket: fix security vulnerability with wildcard IP addresses

This fixes Westpoint Security issue with Advisory ID#: wp-10-0001.
Before, we would allow wildcards in IP addresses like *.2.3.4 ; now,
IP addresses must match excatly.

Patch-by: Richard J. Moore <rich@kde.org>
Task-number: QT-3704

7 years agofix build for -no-qt3support
Peter Hartmann [Mon, 12 Jul 2010 08:47:00 +0000 (10:47 +0200)]
fix build for -no-qt3support

QString::lower() is QT3_SUPPORT, the correct method is
QString::toLower().