summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-113-33/+8
|\ | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix for QTBUG-7267 Qs60Style::drawControl() does not align CE_ItemViewItem Fix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds of
| * Fix for QTBUG-7267 Qs60Style::drawControl() does not align CE_ItemViewItemJani Hautakangas2010-01-111-1/+1
| | | | | | | | | | | | | | | | | | control element correctly if given widget is null. Uses now alignment hint value given in style option. Task-number: QTBUG-7267 Reviewed-by: Janne Koskinen
| * Fix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds ofJani Hautakangas2010-01-112-32/+7
| | | | | | | | | | | | | | | | | | | | times, taking up to 1ms each call. Use S60->ScreenDevice() to get/release fonts instead of create a new screen device each time. Task-number: QTBUG-6408 Reviewed-by: Jason Barron
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-01-113-4/+14
|\ \ | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Correctly determine QScriptValue::isQObject() for QObjects using the
| * | Correctly determine QScriptValue::isQObject() for QObjects using theMichael Brasser2010-01-113-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | QScriptDeclarativeClass. Task-number: QTBUG-6178 Reviewed-by: Kent Hansen Reviewed-by: Aaron Kennedy
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-111-4/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (Sqlite2) Fix for QTBUG-6421
| * | | (Sqlite2) Fix for QTBUG-6421Bill King2010-01-111-4/+12
|/ / / | | | | | | | | | | | | | | | | | | | | | Forgot to port the fix over to sqlite2 which seems to also be affected by the setForwardOnly caching bug as well. Task-number: QTBUG-6421 Reviewed-by: Justin McPherson
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-098-1/+146
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Doc: the QTextDecoder need to be destroyed, reflect that in the example added CONFIG += console to qlalr.pro Add new benchmark for some qtext features. Add texture glyph width cache default. Update changes file
| * | | Doc: the QTextDecoder need to be destroyed, reflect that in the exampleOlivier Goffart2010-01-081-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: Denis
| * | | added CONFIG += console to qlalr.proJoerg Bornemann2010-01-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise we don't see any console output on Windows. Reviewed-by: Roberto Raggi
| * | | Add new benchmark for some qtext features.Thomas Zander2010-01-084-0/+137
| | | | | | | | | | | | | | | | | | | | I test loading some html into a qtextdocument and doing of shaping on an unformatted text of different scripts and bidiness.
| * | | Add texture glyph width cache default.Stefano Pironato2010-01-081-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For maemo6 need to increase the cache width to 1024 to avoid text corruption using SGX 1.4. Reviewed-by: Tom Cooksey Reviewed-by: Harald Fernengel
| * | | Update changes fileAlan Alpert2010-01-081-0/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-6580
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-0953-546/+1087
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (23 commits) Fixed build breakage on S60 3.1 due to audio effects changes Added a flag to avoid construction of application panes. Fixed QDesktopWidget autotest. Fixed a doc error. Enable building with MSVC2008 Added mention of Symbian binary packages to INSTALL file Fix for QTBUG-5870 QGraphicsProxyWidget does not show children on Deploy sqlite3.sis instead of sqlite3.dll in Symbian Separated "make run" and "make runonphone" targets Added UIDs and icons to some webkit examples Implemented node disconnection in Phonon MMF backend Removed dead code from Phonon MMF backend Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark. Implemented support for playlist handling in Phonon MMF backend Mediaplayer: enqueue all entries from .ram file before starting playback Changed call sequence of seeking in Phonon MMF backend, for streaming Implemented buffer status notifications in Phonon MMF backend Added support for streaming playback to Phonon MMF backend Phonon MMF: leaves during object construction throw exceptions Removed stale TODO comments from Phonon MMF backend ...
| * | Merge commit 'origin/mmfphonon' into 4.6Gareth Stockwell2010-01-086-31/+10
| |\ \
| | * | Fixed build breakage on S60 3.1 due to audio effects changesGareth Stockwell2010-01-086-31/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed calls to the video overload of the audio effect constructors, e.g. CAudioEqualizer::NewL(VideoPlayerUtility&) Task-number: QTBUG-7223 Reviewed-by: trustme
| * | | Added a flag to avoid construction of application panes.axis2010-01-088-6/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is purely an optimization for fullscreen-only apps. Task: QTBUG-6098 RevBy: Jason Barron RevBy: mread AutoTest: Included
| * | | Fixed QDesktopWidget autotest.axis2010-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error would happen because Qt would attempt to do focus handling on the desktop widget which eventually resulted in an assert on the Created status of the widget. RevBy: Jani Hautakangas AutoTest: Passed
| * | | Fixed a doc error.axis2010-01-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | The extra line would make qdoc treat the next text as a separate paragraph, but it should be part of the description for the previous value.
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-0844-538/+935
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enable building with MSVC2008 Added mention of Symbian binary packages to INSTALL file Fix for QTBUG-5870 QGraphicsProxyWidget does not show children on Deploy sqlite3.sis instead of sqlite3.dll in Symbian Separated "make run" and "make runonphone" targets Added UIDs and icons to some webkit examples Implemented node disconnection in Phonon MMF backend Removed dead code from Phonon MMF backend Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark. Implemented support for playlist handling in Phonon MMF backend Mediaplayer: enqueue all entries from .ram file before starting playback Changed call sequence of seeking in Phonon MMF backend, for streaming Implemented buffer status notifications in Phonon MMF backend Added support for streaming playback to Phonon MMF backend Phonon MMF: leaves during object construction throw exceptions Removed stale TODO comments from Phonon MMF backend Symbian: More i18n strings work. Fixed bug which caused Phonon backend error messages to be suppressed Added error strings to Phonon MMF backend
| * | | Enable building with MSVC2008Shane Kearns2010-01-083-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the alternate implementation of the registry reading, although the new API is simpler, the old XP method is not deprecated. Added an extra library that is needed according to API documentation, but is omittable on MinGW. Also gave a better error message when serial port detection fails. Reviewed-by: Miikka Heikkinen
| * | | Added mention of Symbian binary packages to INSTALL fileMiikka Heikkinen2010-01-081-0/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6162 Reviewed-by: TrustMe
| * | | Fix for QTBUG-5870 QGraphicsProxyWidget does not show children onJani Hautakangas2010-01-081-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian. QS60PaintEngine returned wrong device in QPaintEngine::paintDevice(). Task-number: QTBUG-5870 Reviewed-by: Jason Barron
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-0739-524/+914
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Deploy sqlite3.sis instead of sqlite3.dll in Symbian Separated "make run" and "make runonphone" targets Added UIDs and icons to some webkit examples Implemented node disconnection in Phonon MMF backend Removed dead code from Phonon MMF backend Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark. Implemented support for playlist handling in Phonon MMF backend Mediaplayer: enqueue all entries from .ram file before starting playback Changed call sequence of seeking in Phonon MMF backend, for streaming Implemented buffer status notifications in Phonon MMF backend Added support for streaming playback to Phonon MMF backend Phonon MMF: leaves during object construction throw exceptions Removed stale TODO comments from Phonon MMF backend Symbian: More i18n strings work. Fixed bug which caused Phonon backend error messages to be suppressed Added error strings to Phonon MMF backend
| | * | | Deploy sqlite3.sis instead of sqlite3.dll in SymbianMiikka Heikkinen2010-01-072-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4879 Reviewed-by: Shane Kearns
| | * | | Separated "make run" and "make runonphone" targetsMiikka Heikkinen2010-01-072-12/+23
| | | | | | | | | | | | | | | | | | | | Reviewed-by: axis
| | * | | Added UIDs and icons to some webkit examplesMiikka Heikkinen2010-01-074-2/+18
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-0731-506/+870
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Implemented node disconnection in Phonon MMF backend Removed dead code from Phonon MMF backend Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark. Implemented support for playlist handling in Phonon MMF backend Mediaplayer: enqueue all entries from .ram file before starting playback Changed call sequence of seeking in Phonon MMF backend, for streaming Implemented buffer status notifications in Phonon MMF backend Added support for streaming playback to Phonon MMF backend Phonon MMF: leaves during object construction throw exceptions Removed stale TODO comments from Phonon MMF backend Symbian: More i18n strings work. Fixed bug which caused Phonon backend error messages to be suppressed Added error strings to Phonon MMF backend
| | | * \ \ Merge branch 'mmfphonon' into 4.6Gareth Stockwell2010-01-0631-506/+870
| | | |\ \ \ | | | | |/ /
| | | | * | Implemented node disconnection in Phonon MMF backendGareth Stockwell2009-12-0820-194/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-4663 Reviewed-by: Frans Englich
| | | | * | Removed dead code from Phonon MMF backendGareth Stockwell2009-12-081-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following source types are handled in MediaObject::createPlayer Invalid, Disc, Stream, Empty The code removed in this patch is therefore never executed. Reviewed-by: Frans Englich
| | | | * | Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark.Gareth Stockwell2009-12-082-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6214 Reviewed-by: Frans Englich
| | | | * | Implemented support for playlist handling in Phonon MMF backendGareth Stockwell2009-12-0812-170/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main changes are: 1. MediaObject emits prefinishMark at the appropriate instant 2. MediaObject emits aboutToFinish at the appropriate instant 3. MediaObject switches to next source when playback completes Task-number: QTBUG-6214 Reviewed-by: Frans Englich
| | | | * | Mediaplayer: enqueue all entries from .ram file before starting playbackGareth Stockwell2009-12-082-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that Phonon::MediaObject::setNextSource is called before the first clip finishes playback, and therefore that the next clip is played once the first finishes. Reviewed-by: Frans Englich
| | | | * | Changed call sequence of seeking in Phonon MMF backend, for streamingGareth Stockwell2009-12-082-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified the sequence of calls made to the MMF APIs when seeking during ongoing playback. This fixes a bug found during early testing of streaming playback, whereby playback would not resume following the seeking operation. This was due to an interaction between the pause / seek / play operations, and the buffering callbacks received from the MMF, which caused the backend to enter an incorrect state. Task-number: QTBUG-4660 Reviewed-by: Frans Englich
| | | | * | Implemented buffer status notifications in Phonon MMF backendGareth Stockwell2009-12-089-62/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clips are buffering (either at the start of playback, or during playback, when buffer levels drop due to e.g. CPU, file system or network load), the backend receives notification from the MMF. While buffering is ongoing, the backend periodically queries the filling status and emits a signal. Task-number: QTBUG-4660 Reviewed-by: Frans Englich
| | | | * | Added support for streaming playback to Phonon MMF backendGareth Stockwell2009-12-088-6/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the MIME type of the stream cannot always be deduced from the URL, we assume that it is a video stream. This is based on the assumption that the video controllers will be capable of parsing the container formats for audio-only, as well as video clips. Note that this assumption may not hold on all devices. Note that most implementations of the MMF client APIs do not support HTTP streaming (a.k.a. progressive download). The backend has therefore only been tested with RTSP streams - see the JIRA entry for further details. Task-number: QTBUG-4660 Reviewed-by: Frans Englich
| | | | * | Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Gareth Stockwell2009-12-082-34/+34
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | mmfphonon
| | | | | * | Symbian: More i18n strings work.Frans Englich2009-12-072-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Consistently capitalize error sentences * Simplify & fix code/documentation. Task-number: QTBUG-4994 Reviewed-by: TrustMe
| | | | * | | Phonon MMF: leaves during object construction throw exceptionsGareth Stockwell2009-12-082-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Frans Englich
| | | | * | | Removed stale TODO comments from Phonon MMF backendGareth Stockwell2009-12-083-4/+1
| | | | |/ / | | | | | | | | | | | | | | | | | | Reviewed-by: Frans Englich
| | | | * | Fixed bug which caused Phonon backend error messages to be suppressedGareth Stockwell2009-12-022-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the mediaplayer receives a state change into the ErrorState, it calls pause() on the media object. Previously, this caused the backend to transition into PausedState. When the mediaplayer subsequently called errorString() to retrieve the error message, an empty string was returned because the backend was no longer in the ErrorState. Task-number: QTBUG-4994 Reviewed-by: trustme
| | | | * | Added error strings to Phonon MMF backendGareth Stockwell2009-12-028-51/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that changing Utils from a namespace into a class, and then using Q_DECLARE_TR_FUNCTIONS in the class declaration, was necessary in order to be able to call tr(...) from the implementation of Utils::symbianErrorToString. Task-number: QTBUG-4994 Reviewed-by: Oswald Buddenhagen
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-082-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make sure the rect in QPixmap::copy() doesn't exceed the boundingRect. Fix a painter warning
| * | | | | | Make sure the rect in QPixmap::copy() doesn't exceed the boundingRect.Gunnar Sletta2010-01-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: http://bugreports.qt.nokia.com/browse/QTBUG-6303 Reviewed-by: Samuel
| * | | | | | Fix a painter warningPierre Rossi2010-01-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using a treewidget with animations in a splitter and the tree is collapsed, and then select an item in the tree that requires expanding, it might end up trying to paint to an invalid pixmap Reviewed-by: Gabi
* | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-01-0825-124/+186
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: QAudioInput loses data on Maemo5/other linux platforms. Fix warning in qfilesystemmodel_p.h Frequency to SampleRate and channels to channelCount. Added setChannelCount() to QAudioFormat.
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Kurt Korbatits2010-01-07434-5810/+18922
| |\ \ \ \ \
| | * \ \ \ \ Merge branch '4.6' of ../../4.6 into 4.6Justin McPherson2010-01-07433-5802/+18914
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | Conflicts: examples/multimedia/audiodevices/audiodevices.cpp
| | * | | | | Fix warning in qfilesystemmodel_p.hJustin McPherson2010-01-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Rhys Weatherley
generated by cgit v0.12 at 2024-11-17 02:48:09 (GMT)