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
Sergio Ahumada
441ce7e6d6
Remove stale QT_MODULE() usage cases
...
As of Qt5, this macro is defined to be empty; simply get rid of these leftovers.
Change-Id: Id24056c0afd013904b1e098dc49e502038fd77a4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com >
2012-10-25 20:15:38 +02: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
Ling Hu
138242fb2d
Added resource policy support though internal plugin system
...
Change-Id: I374be17d49b6a5eed0b1ed94d0b9ca5f9a2caa9b
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com >
2012-03-23 09:53:49 +01:00
