slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,712 Commits 1 Branch 0 Tags
c2c71716825ef8923c63c11d71ace91a1362ce19
Commit Graph

10 Commits

Author SHA1 Message Date
Friedemann Kleint
c2c7171682 Add missing "We mean it" comments to private headers. 
Task-number: QTBUG-48595
Change-Id: I1370d9229b0606582cbd828de84ee2717dca3daf
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
 2015-10-06 13:32:07 +00:00
Siteshwar Vashisht
176d52bb28 Refactored code for audio engine to allow dynamic object creation 
QDeclarativeSound, QDeclarativeAudioSample, QDeclarativeAudioCategory
and QDeclarativeAttenuationModel can now be dynamically added to
AudioEngine instance or declared inside AudioEngine object definition.

QDeclarativePlayVariation can now be dynamically added to Sound
instance or declared inside Sound object definition.

Change-Id: If4c2e16895a71eb71ded1998c107360698f8ac7f
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
 2015-04-23 11:56:18 +00:00
Antti Kokko
bbfccc7135 Update copyright headers 
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: I1c6faa4f59f8eca54f01ef20941fa60161dd7872
Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
 2015-02-12 10:27:47 +00:00
Antti Kokko
2732e23887 Update license headers and add new license files 
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: Ied06887225df341064c12bcc14c259ae74116f2e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
 2014-08-24 17:30:13 +02:00
Frederik Gladhorn
d396262bc9 Merge remote-tracking branch 'origin/stable' into dev 
Conflicts:
	src/multimedia/doc/qtmultimedia.qdocconf
	src/plugins/blackberry/mediaplayer/bbmetadata.cpp
	src/plugins/blackberry/mediaplayer/bbmetadata.h
	tests/auto/unit/qpaintervideosurface/tst_qpaintervideosurface.cpp

Change-Id: I447c297ea15a94d1d2feb0fb5f9edac8c5d4505a
 2013-02-19 17:15:56 +01:00
Sergio Ahumada
157f4f982b Remove QT_{BEGIN,END}_HEADER macro usage 
The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb
and is no longer necessary or used.

Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html
Change-Id: Id95d10f5d9c146d9eb496119af6a8b8501ffcb17
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
 2013-01-28 23:21:21 +01:00
Sergio Ahumada
399500f87e Update copyright year in Digia's license headers 
Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
 2013-01-10 17:56:01 +01:00
Iikka Eklund
dcbbad869e Change copyrights from Nokia to Digia 
Change copyrights and license headers from Nokia to Digia

Change-Id: Id77334cfb15de096941c88e32d04ca07b4eb4709
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
 2012-09-24 09:05:51 +02:00
Jonas Rabbe
8e82f57c6a Updated declarative components to use the QML module 
Change-Id: I4b49466ba5248683c2285f98ce17bc2c24bba515
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
 2012-03-14 05:55:40 +01:00
Ling Hu
809bbc35c6 Add AudioEngine with new implementation 
Change-Id: I5eebe662ecbce9814ed3e763db56df9be737d11f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
 2012-02-06 05:35:28 +01:00