summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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
| * | | | | Discard empty buffer on call to QAudioOutput::resume()Gareth Stockwell2010-09-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Permit QAudioOutput::processedUSecs() to be called immediately after start()Gareth Stockwell2010-09-171-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Discard all DevSound buffers held when QAudioInput::suspend() calledGareth Stockwell2010-09-171-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Fixed buffer overrun in Symbian QAudioInput backendGareth Stockwell2010-09-171-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-13058 Reviewed-by: Derick Hawcroft
| * | | | | QS60Style does not show checkbox for checkable item in QTreeViewSami Merila2010-09-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style currently skips drawing of checkbox for checkable itemviews. It however reserves space for the checkbox in the itemview item row. As a fix, also draw the checkbox. Task-number: QTBUG-11150 Reviewed-by: Shane Kearns
| * | | | | Load environment.prf from Symbian SDK if it exists thereMiikka Heikkinen2010-09-171-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Environment.prf can contain SDK specific variable settings such as SYMBIAN_VERSION. Task-number: QT-3949 Reviewed-by: Janne Koskinen
| * | | | | Remove pre-Symbian3 plugins from Symbian3 and later buildsMiikka Heikkinen2010-09-174-25/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian3 and later builds are not compatible with pre-Symbian3 phones anyway, so no need to build and deploy older version plugins when building for Symbian3 or later. Task-number: QT-3949 Reviewed-by: Janne Koskinen
| * | | | | Panic in qs60style.cpp while drawing a QTreeViewSami Merila2010-09-172-11/+27
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style crashes when running a test application that modifies active style AND application's palette. After switching to other style, setting palette to application default, re-enabling the style's palette and activating QS60Style, causes a crash. This is due to that internal theme palette is tried to access, before it is constructed. Fixed by making sure that when theme palette is accessed, it is not NULL. Task-number: QTBUG-13553 Reviewed-by: Miikka Heikkinen
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-1753-546/+885
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits) Doc: css fine tuning Doc: Fixed a non-compiling example. Doc: removing linebreak Doc: correcting html template Doc: Updated What's new in 4.7 page Doc: Updated What's new in 4.7 page Doc: Removing google analytics from offline docs Doc: fixing creator bug in page footer Doc: correcting html template - validating Doc: fixing issues with table indent - css Doc: Fixing style: line height, ol indent, coulmns (css3) Doc: correcting html template Doc: Updated the Mac requirements page. Doc: Cleaning up the known issues page. Pointing people to check the online resources. Added a QFormLayout snippet to the layout.qdoc and layouts.cpp Doc: Removing section about Multimedia - playback and declarative elements. This was descoped from Qt 4.7. Doc: Listed undoable operations in QTextDocument Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: Note on updating proxy models with dynamic sort filters qdoc: Fixed an html formatting error in the QML property list. ...
| * | | | Merge commit 'staging-1/4.7' into fridayMorten Engvoldsen2010-09-174-14/+16
| |\ \ \ \
| * | | | | Doc: css fine tuningMorten Engvoldsen2010-09-171-3/+3
| | | | | |
| * | | | | Merge branch '4.7' into fridayMorten Engvoldsen2010-09-17362-4120/+3252
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-16356-4102/+3214
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Doc: Fixed a non-compiling example.David Boddie2010-09-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested with namespaced and non-namespaced Qt builds. Reviewed-by: Trust Me
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-1690-517/+3581
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of ../qt-doc-team into 4.7David Boddie2010-09-14238-5528/+10285
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'fixesfor4.7' into 4.7David Boddie2010-09-13229-3261/+8303
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/tutorials/modelview/3_changingmodel/mymodel.h
| | | * | | | | | | moving tutorials out of gitignore. Reviewed by Robert GrieblRoland Wolf2010-09-081-0/+1
| | | | | | | | | |
| | | * | | | | | | small fixes on the modelview tutorialRoland Wolf2010-09-081-11/+19
| | | | | | | | | |
| | | * | | | | | | minor formatting fixRoland Wolf2010-09-082-2/+2
| | | | | | | | | |
| | | * | | | | | | fix for compilation with namespaceRoland Wolf2010-09-082-2/+2
| | | | | | | | | |
| | | * | | | | | | minor formatting fixRoland Wolf2010-09-082-2/+2
| | | | | | | | | |
| | | * | | | | | | fix for compilation with namespaceRoland Wolf2010-09-084-6/+22
| | | | | | | | | |
| | * | | | | | | | compilation with namespaces was broken. fixedRoland Wolf2010-09-062-3/+1
| | | | | | | | | |
| | * | | | | | | | Merge remote branch 'upstream/4.7' into 4.7Roland Wolf2010-09-06280-4099/+12074
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of ↵Roland Wolf2010-09-0240-858/+541
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/msculls-modelview-qdoc-enhancement into 4.7
| * | | | | | | | | | | Doc: removing linebreakMorten Engvoldsen2010-09-161-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Doc: correcting html templateMorten Engvoldsen2010-09-161-12/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Doc: Updated What's new in 4.7 pageGeir Vattekar2010-09-161-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Henry Haverinen
| * | | | | | | | | | | Doc: Updated What's new in 4.7 pageGeir Vattekar2010-09-161-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Henry Haverinen
| * | | | | | | | | | | Merge branch '13092010doc' into doc-4.7Morten Engvoldsen2010-09-162-24/+58
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/qdoc3/test/qt-html-templates.qdocconf
| | * | | | | | | | | | | Doc: Removing google analytics from offline docsMorten Engvoldsen2010-09-162-15/+5
| | | | | | | | | | | | |
| | * | | | | | | | | | | Doc: fixing creator bug in page footerMorten Engvoldsen2010-09-161-1/+8
| | | | | | | | | | | | |
| | * | | | | | | | | | | Doc: correcting html template - validatingMorten Engvoldsen2010-09-161-1/+1
| | | | | | | | | | | | |
| | * | | | | | | | | | | Doc: fixing issues with table indent - cssMorten Engvoldsen2010-09-161-3/+3
| | | | | | | | | | | | |
| | * | | | | | | | | | | Doc: Fixing style: line height, ol indent, coulmns (css3)Morten Engvoldsen2010-09-161-16/+43
| | | | | | | | | | | | |
| | * | | | | | | | | | | Doc: correcting html templateMorten Engvoldsen2010-09-161-28/+22
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into doc-4.7Morten Engvoldsen2010-09-169-142/+113
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Geir Vattekar2010-09-166-141/+90
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Doc: Cleaning up the known issues page. Pointing people to check the online ↵Morten Engvoldsen2010-09-161-120/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resources.
| | | * | | | | | | | | | Added a QFormLayout snippet to the layout.qdoc and layouts.cppJerome Pasion2010-09-162-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Tasks: QTBUG-10077
| | | * | | | | | | | | | Doc: Removing section about Multimedia - playback and declarative elements. ↵Morten Engvoldsen2010-09-161-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was descoped from Qt 4.7.
| | | * | | | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-152-7/+32
| | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Doc: Updated the Mac requirements page.Geir Vattekar2010-09-161-0/+3
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Morten Engvoldsen
| | * | | | | | | | | | | Doc: Listed undoable operations in QTextDocumentGeir Vattekar2010-09-151-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-1212 Reviewed-by: David Boddie
| | * | | | | | | | | | | Doc: Note on updating proxy models with dynamic sort filtersGeir Vattekar2010-09-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-689 Reviewed-by: David Boddie
| * | | | | | | | | | | | Revert "Doc: fixing page name bug caused by ↵Morten Engvoldsen2010-09-151-28/+22
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page" Doc: pulling back redundant fix that is breaking links - qmlelements.html/declarativeelements.html This reverts commit 064b7fe6f97bcf214f749794c5ccab3b4cf0bcc7.