summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change copyrights from Nokia to Digia4.6Sergio Ahumada2012-11-279574-161612/+161536
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I8b2ed2e09e9beb46bdda354017c29f00be6ae76f Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change licenses and license headers from Nokia to DigiaSergio Ahumada2012-11-166-166/+165
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I3b1d30c5d80c87cdd60edac6eb553199ae51ca33 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2011-01-182-36/+66
|\ | | | | | | | | | | | | | | * '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"
| * Fixed unescaped backslashes in testcase.prfRohan McGovern2011-01-171-2/+2
| | | | | | | | (cherry picked from commit c5beba29f1ac44ce225d73da67503f23f8aeffdc)
| * Fix `make check' for debug-and-release on Windows.Rohan McGovern2011-01-171-2/+16
| | | | | | | | (cherry picked from commit 012a777ecec0ca74cf95683f069cb79774b7093a)
| * Move `check' target for autotests into testcase.prfRohan McGovern2011-01-172-35/+52
| | | | | | | | | | | | testcase.prf is installed, thus allowing `make check' to work outside of the Qt source tree. (cherry picked from commit d29e1dda8fbc24087b9cf0bf08d929bef74f5c96)
| * Revert "Backporting TESTARGS feature from 4.7"João Abecasis2011-01-171-1/+0
| | | | | | | | This reverts commit 0336bc0cc8b4c0b0e75315594c1db83ee9b30f2e.
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2011-01-121-0/+1
|\ \ | |/ | | | | | | * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Backporting TESTARGS feature from 4.7
| * Backporting TESTARGS feature from 4.7João Abecasis2011-01-121-0/+1
| | | | | | | | | | | | | | | | Originally introduced in d29e1dda8fbc24087b9cf0bf08d929bef74f5c96. This patch should be reverted when it reaches the 4.7 branch again. Reviewed-by: Sergio Ahumada
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2011-01-128990-9063/+9063
|\ \ | |/ | | | | | | * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update copyright year to 2011.
| * Update copyright year to 2011.Jason McDonald2011-01-118990-9063/+9063
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1Qt Continuous Integration System2010-12-201-0/+2
|\ \ | |/ | | | | | | * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: embed copyright information in QtAssistantClient4.dll
| * embed copyright information in QtAssistantClient4.dllJoerg Bornemann2010-12-171-0/+2
| | | | | | | | | | Task-number: QT-4054 Reviewed-by: Christian Kandeler
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-263-5/+5
|\ \ | |/ | | | | | | | | | | | | 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
| * QLocalSocket/Win: do not emit error() when no error actually occurredJonathan Liu2010-11-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Doc: fix typoJoerg Bornemann2010-11-262-3/+3
|/ | | | Reviewed-by: mauricek
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-11-242-0/+8
|\ | | | | | | | | | | | | 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.
| * Fix compliation of ALSA audio backend when checking for surround support.Justin McPherson2010-11-242-0/+8
|/ | | | | | | Surround support requires ALSA lib >= 1.0.14 Task-number: QTBUG-15205 Reviewed-by: Andrew den Exter
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-11-222-2/+22
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed handling of QInputMethodEvents with nonzero replacementLength.
| * Fixed handling of QInputMethodEvents with nonzero replacementLength.axis2010-11-192-2/+22
|/ | | | | | | | | | 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
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-272-0/+36
|\ | | | | | | | | | | | | | | 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.
| * Fix Windows compilation.Samuel Rødal2010-10-272-0/+2
| | | | | | | | | | | | | | Don't take for granted that these are included... Task-number: QTBUG-14614 Reviewed-by: Bradley T. Hughes
| * Fixed race condition in raster paint engine.Samuel Rødal2010-10-272-0/+34
|/ | | | | | | We need to protect the gradient cache accesses with a mutex. Task-number: QTBUG-14614 Reviewed-by: Bradley T. Hughes
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-10-132-79/+90
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Demo Spectrum wav data size is not calculated correctly
| * Demo Spectrum wav data size is not calculated correctlyJustin McPherson2010-10-132-79/+90
|/ | | | | | | | - 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
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-121-0/+0
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Rename .pro file to match directory name.
| * Rename .pro file to match directory name.Jason McDonald2010-10-121-0/+0
| | | | | | | | | | Task-number: none Reviewed-by: Trust Me
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-124-16/+4
|\ \ | |/ |/| | | | | | | | | 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"
| * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-124-16/+4
|/ | | | | | | | | | 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
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-10-113-0/+14
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add header guards to audio example headers.
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-10-113-0/+14
| |\ |/ / | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Add header guards to audio example headers.
| * Add header guards to audio example headers.Justin McPherson2010-10-083-0/+14
| | | | | | | | | | Task-number: QTBUG-13413 Reviewed-by: Andrew den Exter
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-111-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Fixed qdoc warning.
| * | Doc: Fixed qdoc warning.David Boddie2010-10-081-1/+1
| |/ | | | | | | Reviewed-by: hjk
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-1012-64/+572
|\ \ | |/ |/| | | | | | | | | | | | | | | 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
| * Added qmake check for presence of RHttpDownloadMgr headerGareth Stockwell2010-10-084-29/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * qmediaplayer: show buffer status of 0%Gareth Stockwell2010-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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
| * Progressive download in Phonon MMF backend: integrated with playerGareth Stockwell2010-10-088-43/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Progressive download in Phonon MMF backend: added download managersGareth Stockwell2010-10-083-0/+308
|/ | | | | | | | 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
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-071-0/+1
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix build with cups 1.5 snapshots
| * Fix build with cups 1.5 snapshotsBernhard Rosenkraenzer2010-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-012-0/+9
|\ \ | |/ | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Build fix for -qtnamespace.
| * Build fix for -qtnamespace.Leandro Melo2010-09-302-0/+9
|/ | | | | Reviewed-by: Thiago Macieira (cherry picked from commit b8089f0b7a0fef9318070aea9c8344bfe987bac9)
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-09-2312-35/+235
|\ | | | | | | | | | | | | | | 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.
| * Fix compile failure in QtMultimedia.Andrew den Exter2010-09-231-3/+3
| | | | | | | | | | | | | | QAudioFormat::sampleRate() and QAudioFormat::channelCount() weren't introduced until 4.7. Use frequency() and channels() instead. Reviewed-by: Justin McPherson
| * Verify the audio format before trying to open an audio device.Andrew den Exter2010-09-2212-35/+235
|/ | | | | | | | | 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
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-174-52/+89
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Implement QAudioInput::suspend() using CMMFDevSound::Stop()Gareth Stockwell2010-09-174-42/+73
| | | | | | | | | | | | | | | | | | | | | | 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
| * Discard buffer pointer when DevSound is stoppedGareth Stockwell2010-09-171-0/+1
| | | | | | | | | | Task-number: QTBUG-13504 Reviewed-by: Derick Hawcroft
| * Suppress overflow errors raised by Symbian DevSound during playbackGareth Stockwell2010-09-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
View Lorry Controller Status