summaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'test_merge' of ../sensorsAlex2010-06-103-47/+33
|\
| * Merge branch 'main_master' into sensors_masterLincoln Ramsay2010-06-0958-1142/+1072
| |\
| * \ Merge branch 'sensors_1.0' into sensors_masterLincoln Ramsay2010-06-09366-11238/+177111
| |\ \
| | * | Fix for MOBILITY-926: Don't read dataFormat because the enum order differs be...Jaakko Vuori2010-06-081-38/+33
* | | | Merge branch '1.0'Alex2010-06-103-187/+131
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch '1.0' of ../qtm-serviceframework into 1.0Alex2010-06-101-3/+4
| |\ \ \
| | * | | remove need for qimportbase.priAlex2010-06-091-3/+4
| * | | | Fix uniqueness constraints in maemo5 backendChris Adams2010-06-092-85/+28
| * | | | Maemo5: QContactABook::getOnlineAccountDetail has been rewritten. Capabilitie...Antonio Aloisio2010-06-081-9/+75
| * | | | Maemo5: Removing some old comments and useless commented codeAntonio Aloisio2010-06-081-90/+24
* | | | | Merge branch '1.0'Alex2010-06-0921-521/+477
|\| | | |
| * | | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts into 1.0Michael Goddard2010-06-081-0/+12
| |\ \ \ \
| | * | | | Fix bug in maemo5 engine relating to phone number removalChris Adams2010-06-081-0/+12
| * | | | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0Michael Goddard2010-06-08236-3159/+6707
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Symbian: remove not needed S60VideoOutputControlAntti2010-06-044-152/+0
| | * | | | Symbian: OpenMaxAL: Changes PLUGIN_SUBDIR to PLUGIN_TYPE inAntti2010-06-041-1/+1
| | * | | | Symbian: Use lowercase includes for api dependencyAntti2010-06-045-5/+5
| | * | | | Merge branch '1.0' into s60_buildAntti2010-06-0464-705/+1027
| | |\| | |
| | * | | | Symbian: MMF multimedia backend/examples/testcases refactor due to APIMarkus Nolvi2010-06-038-352/+358
| | * | | | Merge remote branch 'origin/1.0' into s60_buildMarkus Nolvi2010-06-031-0/+2
| | |\ \ \ \
| | * \ \ \ \ Merge remote branch 'origin/1.0' into 1.0-s60-fixesMarkus Nolvi2010-05-318-45/+174
| | |\ \ \ \ \
| | * | | | | | allowing all qualities for wav and amrShubham Baheti2010-05-281-0/+4
| | * | | | | | fix for constant quality bitrate settingShubham Baheti2010-05-281-1/+4
| * | | | | | | Fix bug in maemo5 backend affecting contact save operationsChris Adams2010-06-082-2/+78
| * | | | | | | Maemo5: Phone number details can be overwritten. Commit related to the first ...Antonio Aloisio2010-06-071-1/+1
| * | | | | | | Maemo5: Remove useless debug macroAntonio Aloisio2010-06-071-1/+0
| * | | | | | | Fix thumbnail support in maemo5 engineChris Adams2010-06-031-6/+14
* | | | | | | | Merge branch '1.0' into mergeAlex2010-06-04255-2734/+175271
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Fix header path.Justin McPherson2010-06-031-1/+1
| * | | | | | | Rename merrry-go-round; QtMultimedia->QtMultimediaKit.Justin McPherson2010-06-0339-578/+578
| * | | | | | | Merge branch '1.0' of git@scm.dev.nokia.troll.no:qtmobility/qtm-multimedia in...Justin McPherson2010-06-031-0/+2
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Symbian: Fixes the issue where videoplayer backend crashed on orientationMarkus Nolvi2010-06-031-0/+2
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'sensors_1.0' into main_1.0Lincoln Ramsay2010-06-0125-127/+449
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Manually merge in the symbian-dev branch.Lincoln Ramsay2010-06-018-108/+433
| | * | | | Fix misplaced lines of consts fixesTapio Rantala2010-05-284-8/+8
| | * | | | Don't use old target.path styleTapio Rantala2010-05-281-3/+0
| | * | | | Revert revert of constsTapio Rantala2010-05-2816-16/+16
| * | | | | Merge branch '1.0' of git@scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0Justin McPherson2010-05-313-1/+158
| |\| | | |
| | * | | | Cleanup from bad merge commits.Lincoln Ramsay2010-05-283-1/+158
| | | |/ / | | |/| |
| * / | | Fixed compile errors on maemo platform.Kurt Korbatits2010-05-315-44/+16
| |/ / /
| * | | symbian: fix compileDerick Hawcroft2010-05-281-2/+1
| * | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into 1.0Derick Hawcroft2010-05-2832-117/+169408
| |\ \ \
| | * \ \ Merge branch '1.0' of git@scm.dev.nokia.troll.no:qtmobility/qtmobility into 1.0Justin McPherson2010-05-2832-117/+169408
| | |\ \ \
| | | * | | Merge branch '1.0' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts into mai...Michael Goddard2010-05-2831-116/+169407
| | | |\| |
| | | | * | Maemo5: tst_qcontactmanagerfiltering was failing because contact display name...Antonio Aloisio2010-05-282-23/+37
| | | | * | Maemo5: tst_QContactManager::add fails when display labels are compared. The ...Antonio Aloisio2010-05-272-3/+30
| | | | * | Maemo5 Organization name was saved in the wrong QContactOrganization field. S...Antonio Aloisio2010-05-272-6/+6
| | | | * | Maemo5: Read QContactOrganization from E_CONTACT_ORG and not from E_CONTACT_T...Antonio Aloisio2010-05-261-1/+1
| | | | * | Symbian: Revert some of the changes in c14470c2e705cc7f8378e23a6d2000f9d14fd0baJani Honkonen2010-05-262-18/+59
| | | | * | Symbian: Fixed signal emissions for pre 10.1 platforms.Jani Honkonen2010-05-255-103/+219