| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
| |
Change-Id: I96513e8b6f09e76998a18edb5411ae06f52cba7c
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
| |
|
|
|
|
|
| |
Also fixing some left overs from 8de152a9e1deb533070663cccf6a98e0d374b1d6
Change-Id: I28a91ca233dd835e6e53efbbd7ebd649461f5c04
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: Ie3b9224b2b6a32b417fa0b6643350d45046381e6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
|
|
|
|
| |
Fix license in files having old license.
Reviewed-by: Trust Me
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/snippets/snippets.pro
examples/sensors/reading_perf/reading_perf.pro
examples/sensors/test_manual/test_manual.pro
plugins/multimedia/symbian/mmf/mediaplayer/mediaplayer_s60.pri
tests/location-testing-tools/geoservicedemo/geoservicedemo.pro
tests/location-testing-tools/mapviewer/mapviewer.pro
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
So that:
a) it compiles
b) it gets c++ style checked
c) it can be made more consistent
Task-number: QTMOBILITY-1328
Reviewed-by: Jonas Rabbe
Change-Id: Ifdd8d9c41dc375b04c601585470daadb21887758
|
| |/ |
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
config.tests/lbt/lbt.pro
configure
configure.bat
dist/changes-1.0.0
doc/src/installation.qdoc
examples/player/player.cpp
plugins/declarative/declarative.pro
plugins/multimedia/symbian/mmf/mmf.pro
plugins/multimedia/symbian/openmaxal/mediarecorder/mediarecorder.pro
src/multimedia/multimedia.pro
src/multimedia/qvideooutputcontrol.cpp
src/multimedia/video/qimagevideobuffer.cpp
tests/auto/qaudiooutput/wavheader.h
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
To keep in sync with Qt/MediaServices.
Conflicts:
examples/audiorecorder/audiorecorder.cpp
plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp
|
| | |
| |
| |
| |
| |
| | |
To make it compatible with Qt 4.7
Task-number: MOBILITY-763
|
| | | |
|
| | |
| |
| |
| | |
To keep in sync with Qt/MediaServices.
|
| |/
|
|
|
|
| |
To make it compatible with Qt 4.7
Task-number: MOBILITY-763
|
| | |
|
| | |
|
| | |
|
| |
|