summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-messaging into ↵1.0Qt Continuous Integration System2010-10-151-0/+3
|\ | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-messaging: MOBILITY-1739 fix, ensures that ipEntrySelection is always created before calling getAccountSpecificMessagesL
| * Merge branch 'symbian-dev-1.0' into 1.0Don Sanders2010-10-151-0/+3
| |\
| | * MOBILITY-1739 fix, ensures that ipEntrySelection is always created before ↵Marko Minkkinen2010-10-151-0/+3
| | | | | | | | | | | | calling getAccountSpecificMessagesL
* | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-messaging into ↵Qt Continuous Integration System2010-10-156-56/+164
|\| | | | | | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-messaging: QTMOBILITY-535 fix, makes sure that simultaneous message queries work MOBILITY-1479 fix, multiple email accounts crash fixed, retrieve message sender crash fixed
| * | Merge branch 'symbian-dev-1.0' into 1.0Don Sanders2010-10-156-56/+164
|/| | | |/
| * QTMOBILITY-535 fix, makes sure that simultaneous message queries workMarko Minkkinen2010-10-146-45/+121
| |
| * MOBILITY-1479 fix, multiple email accounts crash fixed, retrieve message ↵Marko Minkkinen2010-10-112-11/+43
| | | | | | | | sender crash fixed
* | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into ↵Qt Continuous Integration System2010-10-112-7/+7
|\ \ | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: Updating auto tests to match current implementation
| * | Updating auto tests to match current implementationhawcroft2010-10-112-7/+7
| | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/s60installs.pro
* | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into ↵Qt Continuous Integration System2010-10-083-0/+14
|\| | | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: 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 '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into ↵Qt Continuous Integration System2010-10-088-302/+518
|\| | | | | | | | | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: Fix compile failure on symbian. Fix QAbstractVideoSurface assert when Qt version changes. Add tests for QAbstractVideoBuffer and QAbstractVideoSurface.
| * | Fix compile failure on symbian.Andrew den Exter2010-10-081-8/+12
| | | | | | | | | | | | | | | | | | | | | We still need to define the QAbstractVideoSurfacePrivate constructor even though we know no-one will ever link against it. Reviewed-by: Justin McPherson
| * | Fix QAbstractVideoSurface assert when Qt version changes.Andrew den Exter2010-10-083-303/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To allow QtMultimediaKit to build without access to Qt's private headers and keep binary compatible with the QAbstractVideoSurface in Qt, we included a copy of QObjectPrivate in qabstractvideosurface_p.h. This created a situation where QAbstractVideoSurface could not be run using a different version of Qt to the one it was built against. This removes the copy of QObjectPrivate, and instead uses QObject dynamic properties to store member variables. Reviewed-by: Justin McPherson
| * | Add tests for QAbstractVideoBuffer and QAbstractVideoSurface.Andrew den Exter2010-10-085-0/+472
|/ / | | | | | | | | | | These are direct copies of the tests in Qt. Reviewed-by: Justin McPherson
* | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into ↵Qt Continuous Integration System2010-10-072-70/+47
|\ \ | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: Slideshow layout ill suited to touch screen devices.
| * | Slideshow layout ill suited to touch screen devices.Andrew den Exter2010-10-062-70/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use QMainWindow instead of a custom layout to layout the UI for the slideshow as QMainWindow allows better integration with native menu systems. Task-number: MOBILITY-782 Reviewed-by: Dmytro Poplavskiy
* | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework ↵Qt Continuous Integration System2010-10-0722-7082/+7082
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework: configure.bat MUST be CRLF fix line endings
| * | | configure.bat MUST be CRLFAlex2010-10-072-677/+678
| | | |
| * | | fix line endingsOswald Buddenhagen2010-10-0623-7759/+7758
|/ / /
* | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into ↵Qt Continuous Integration System2010-10-061-6/+10
|\| | | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: QVideoWidget::sizeHint() is only updated when media is loaded.
| * | QVideoWidget::sizeHint() is only updated when media is loaded.Andrew den Exter2010-10-061-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | Update the size hint when the the state of the video sink changes instead of when the entire pipeline's state changes. Task-number: QTMOBILITY-548 Reviewed-by: Dmytro Poplavskiy
* | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into ↵Qt Continuous Integration System2010-10-062-61/+100
|\| | | | | | | | | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: Fix replaying media from a state of status changed signal. [WMP] Fix the return value of duration in the WMP media player backend. Set the correct status at end of media in the WMP media player backend.
| * | Fix replaying media from a state of status changed signal. [WMP]Andrew den Exter2010-10-052-56/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows media player has more granular status transitions than QMediaPlayer and will emit end of media before it has reached a stopped state. Since calling play on already playing media will do nothing we need to defer emitting the signals until after its stopped. We use a posted event for this as calling into the WMP API from within its own event handlers is not recommended. Task-number: MOBILITY-1538 Reviewed-by: Justin McPherson
| * | Fix the return value of duration in the WMP media player backend.Andrew den Exter2010-10-052-4/+1
| | | | | | | | | | | | | | | | | | | | | The value was being queried and then discared in favor of a member variable that was always 0. Reviewed-by: Justin McPherson
| * | Set the correct status at end of media in the WMP media player backend.Andrew den Exter2010-10-051-1/+1
|/ / | | | | | | | | | | | | Was setting StalledMedia instead of EndOfMedia. Task-number: MOBILITY-1538 Reviewed-by: Justin McPherson
* | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ↵Qt Continuous Integration System2010-10-053-4/+26
|\ \ | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-location: Potential fix for position source confusion on S60.
| * | Potential fix for position source confusion on S60.David Laing2010-10-053-4/+26
|/ /
* | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/sensors into ↵Qt Continuous Integration System2010-10-041-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/sensors: rm range
| * | rm rangep2niemel2010-10-041-1/+1
| | |
* | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/sensors into ↵Qt Continuous Integration System2010-10-011-2/+2
|\| | | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/sensors: double tap is the default
| * | double tap is the defaultp2niemel2010-10-011-2/+2
| | |
* | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/sensors into ↵Qt Continuous Integration System2010-10-011-0/+1
|\| | | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/sensors: double tap is the default
| * | double tap is the defaultp2niemel2010-10-011-0/+1
| | |
* | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/sensors into ↵Qt Continuous Integration System2010-10-012-0/+2
|\| | | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/sensors: A new symbol was added to sensors.
| * | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/sensors into sensors_1.0Lincoln Ramsay2010-10-011-14/+17
| |\ \ | |/ / |/| |
* | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into ↵Qt Continuous Integration System2010-10-011-14/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: QAudioOutput(ALSA); Fix check for available devices.
| * | | QAudioOutput(ALSA); Fix check for available devices.Justin McPherson2010-10-011-14/+17
|/ / / | | | | | | | | | | | | | | | | | | ALSA can return a list of one empty item when no devices are available. Task-number: QTMOBILITY-526, QTBUG-12690 Reviewed-by: Andrew den Exter
| * / A new symbol was added to sensors.Lincoln Ramsay2010-10-012-0/+2
|/ / | | | | | | Fixes: MOBILITY-1526
* | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo into ↵Qt Continuous Integration System2010-10-014-9/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo: fix build do not return mac address is wifi has no power fix misspelling MMC -> MCC
| * | fix buildLorn Potter2010-10-011-4/+4
| | |
| * | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo into 1.0Lorn Potter2010-10-011-2/+3
| |\ \ | |/ / |/| |
* | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into ↵Qt Continuous Integration System2010-09-301-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: Remove reference to pulseaudio flags from Qt configure step. use pkgconfig to find pulse libraries
| * | | Remove reference to pulseaudio flags from Qt configure step.Justin McPherson2010-09-301-2/+0
| | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * | | use pkgconfig to find pulse librariesJamey Hicks2010-09-301-0/+3
|/ / / | | | | | | | | | | | | Merge-request: 8 Reviewed-by: Justin McPherson <justin.mcpherson@nokia.com>
| * | do not return mac address is wifi has no powerLorn Potter2010-10-011-1/+12
| | | | | | | | | | | | Task-number: iMOBILITY-1536
| * | fix misspelling MMC -> MCCLorn Potter2010-10-013-8/+8
|/ / | | | | | | Task-number: MOBILITY-1533
* | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into ↵Qt Continuous Integration System2010-09-291-10/+14
|\ \ | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: symbian: Disable sis packaging of declarative multimedia plugins
| * \ Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into ↵Qt Continuous Integration System2010-09-291-10/+14
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 1.0-integration * '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia: symbian: Disable sis packaging of declarative multimedia plugins
| | * | symbian: Disable sis packaging of declarative multimedia pluginshawcroft2010-09-291-10/+14
| | | | | | | | | | | | | | | | see also f1a30766
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 16:39:58 +0000