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
Sze Howe Koh
f4348fe3ae
Decouple qmediametadata.h from qmultimedia.h
...
qmultimedia.h is included in more places, but qmediametadata.h is
larger. This patch should reduce unnecessary #include-ing.
Change-Id: I4a3d174bafc555d794bb75087c1f6b79745ae903
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com >
2013-05-14 11:27:05 +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
Friedemann Kleint
cc24af773b
Fix syncqt-warnings.
...
Use include with module name for the multimedia-classes.
Change-Id: I8da1a4015a162959b604cd859aee139e246e3f6c
Reviewed-by: Andras Becsi <andras.becsi@digia.com >
2012-11-19 19:37:40 +01:00
Sze Howe Koh
47fe5f9b39
Enable the "#include <QMultimedia>" camel-case header
...
Rename qtmedianamespace.h/cpp -> qmultimedia.h/cpp, and have
sync.profile generate the camel-case header during compilation.
Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html )
Change-Id: Iade9ee6538970b4b9935f169eb2d9a0ea6949a95
Reviewed-by: Lars Knoll <lars.knoll@digia.com >
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com >
2012-11-06 18:20:09 +01:00
