Commit Graph

29 Commits

Author SHA1 Message Date
Frederik Gladhorn
0a05ae5446 Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ia2cf3c55e57d7ac17f02965915fa6933ff2c8cce
2013-07-11 23:26:39 +02:00
Yoann Lopes
e15a2b92b6 Android: removed unnecessary init class for QtMultimedia.jar
Change-Id: Ib13597389a3896da8b619993d197623e7c74a7e0
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2013-07-09 14:47:01 +02:00
Frederik Gladhorn
9785766067 Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
	.qmake.conf
	sync.profile

Change-Id: I62a3095e4a4d507de199fac32b64e9e76323bbf4
2013-06-04 19:50:11 +02:00
Frederik Gladhorn
0ef52f0102 Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I24ffb71c4cc2e262394797deb8a22b2cf9a80c3c
2013-05-23 13:15:45 +02:00
Christian Strømme
94652ea6dd Android: add libQt5MultimediaQuick_p to the list of dependencies.
libQt5MultimediaQuick_p is first loaded as a result of a qml import, and
is therefore not detected as a dependency.
Note that libQt5MultimediaQuick_p will only be added as a dependency if
QtQuick is used.

Task-number: QTBUG-30861
Change-Id: I8ce818ef1648302bbbbdf63ef133185a66b66cca
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-23 11:56:37 +02:00
Eskil Abrahamsen Blomfeldt
8e202bcad1 Make it possible to bundle Android builds
We need to adapt to the way the jar builds are split on Android,
into a jar file which can be bundled and one which can be distributed
and loaded on the classpath.

We also need to add meta-information about which plugins the
module depends on so that they can be bundled as well.

Task-number: QTBUG-30751
Change-Id: I5cca51c3732ce72985df29672a219c3fd4fe7bac
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
2013-05-03 14:46:15 +02:00
Tobias Koenig
18dbfc2538 Add autoOrientation property to QDeclarativeVideoOutput
The autoOrientation property is a flag to switch on/off
automatic rotation of the video output, depending on the
current screen orientation, to always show the output
upright. This is useful when the VideoOutput is used as
viewfinder for a Camera.

Change-Id: I72753888592dc59c9adaa3343bfec8b168343229
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
2013-03-19 13:33:43 +01:00
Christian Strømme
909a09069f Android multimedia plug-in.
Adds MediaPlayer support for Android.

Change-Id: I4c7b1e19927b2e50b227f3a3b3f7ca2e99397618
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-03-06 00:23:50 +01:00
Oswald Buddenhagen
c414890d85 remove leftover code from multimediawidgets carve-out
Change-Id: Ibb347193761a94ce4a309eddb75af37b73dd9be6
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2013-01-08 11:10:02 +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
Sze Howe Koh
13fd00199a Enable the "#include <QMediaMetaData>" camel-case header
Move the QMediaMetaData namespace into new files, and have sync.profile
generate the camel-case header during compilation.

For now, the new header (qmediametadata.h) is included whereever the old
one appears (qtmedianamespace.h), but an audit will be done later to
make explicit #includes only where necessary.

NOTE: Git may think that a rename has occurred.

Part of the Header Consistency Project
(http://lists.qt-project.org/pipermail/development/2012-October/007570.html)

Change-Id: I63705722a5e175628d56128888a94ae4c20879f2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2012-11-06 18:20:02 +01:00
Tor Arne Vestbø
c64d7ce2a2 Update docs after modularization of docs
The global files now live in qtbase only, and are made available to the
other modules via the $QT_INSTALL_DOCS variable.

We now use QMAKE_DOCS to trigger doc generation instead of rolling our
own rules for qdoc.

Change-Id: I900029d71c305a1f269cddeeb0e05c524d933834
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2012-10-11 15:47:53 +02:00
Oswald Buddenhagen
83b79659b6 centralize load(qt_build_config)s in .qmake.conf
Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-12 12:37:43 +02:00
Oswald Buddenhagen
2a8577d732 follow rename of qt_module_config.prf to qt_module.prf
Change-Id: I6fd02095b9c75952c689b2c55aec9c71b39aadd3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-08-11 13:31:12 +02:00
Oswald Buddenhagen
b1a4d7f9fc build system cleanups
- load(qt_module) => load(qt_build_config)
- remove:
  - CONFIG+=module (obsolete)
  - code relating to module version headers (automated now)
  - %mastercontent assignment (automated now)
  - QT_BUILD_*_LIB defines (automated now)
  - pointless QPRO_PWD assignments
  - pointless DEFINES+=QT_MAKEDLL
  - pointless and commented out include and depend paths
  - qmake -project boilerplate

Change-Id: I8f4586403848fe8f2dff4e889b389956ffcdea59
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-25 11:44:40 +02:00
Oswald Buddenhagen
c495dfe142 auto-generate module pris
Change-Id: I19285dfef7294e813ec241a8f6f00a804d56df49
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-25 09:50:37 +02:00
Jonathan Liu
641474ab10 Fix MinGW-w64 compilation
Change-Id: I812b53e822947a9f85d6523722c6a4f9e57e0426
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-30 11:04:05 +02:00
Michael Goddard
8484b0ff9c Fix a number of doc errors and warnings.
* Document a few missing classes/functions/methods
* Fix a number of QML snippets that wouldn't work as standalone snippets
* Add files to .pro so they show up in Creator..

Still the mysterious lack of controls dir documentation persists :/

Change-Id: I57162371a4d966e4db5bdb1b71d1baf9c0ca57c3
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-04-11 03:31:52 +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
Jonas Rabbe
a8ba6e3c7f Updated plugins to use new plugin architecture
Changed QMediaPluginLoader to use QFactoryLoader instead of QPluginLoader
and used metadata to get keys.
Removed QAudioPluginLoader and changed audio classes to use instead use
QMediaPluginLoader.
The plugins must include the Q_PLUGIN_METADATA macro, and no longer use
the Q_PLUGIN_EXPORT/Q_PLUGIN_EXPORT2 macros.
A json file has been added for each plugin which can contain metadata
which is available to the plugin loader before the plugin is actually
loaded, and is used to read the keys for the plugin, e.g. supported
services.
QFactoryInterface will be deprecated and has been removed from all
plugins.

Change-Id: I035b82f9c9c65717bebf704d560ea8f891df21da
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-03-20 23:39:45 +01:00
Dmytro Poplavskiy
ee39683e27 Moved QMediaServiceProvider to private header.
It's not intended to be used by applications.

Change-Id: I2acc26180ebb5c2419438169827f39aaf4578389
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-02-06 13:57:42 +01:00
Michael Goddard
78ffd1bc18 Remove QMediaImageViewer (SC break).
This class has turned out to be not very useful at this point in time.

Change-Id: Ic07132bdcd01a912a6dd1160c867979fd1307b6a
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-02-03 03:21:43 +01:00
Michael Goddard
b7fcfd4ea9 More minor doc fixes.
- Missing enums
- Misspelt \fn etc
- Missing QSoundEffect C++ docs
- A few typos etc

Change-Id: I3418e79b5d50a7ab86e54d79676c33d06954bef5
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-01-17 05:19:02 +01:00
Michael Goddard
502d3c8eb3 Restructure the source code a little.
Change-Id: I995b0fb33bdda7f01bf6266c1c50a1b17eba6760
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-01-05 01:13:44 +01:00
Ling Hu
093a3efbf3 Add new gapless playback control interface
Change-Id: If14c20af6da81dd65177102c9b955e3ebd40c722
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-01-04 03:43:32 +01:00
Michael Goddard
8ff4148342 Add qRegisterMetaTypes for the public Q_DECLARE_METATYPEs.
Also turned qtmedianamespace.qdoc into a cpp file so I
could stick the qRegisterMetaTypes into it.

Change-Id: Idd6d3e2f348f1ed45b0a35ce180d023a170e8625
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-11-09 01:24:18 +01:00
Friedemann Kleint
6703ebf362 QtMultimedia: Remove qpa-sections from .profiles.
Prepare for removal of the -qpa configure option.

Change-Id: Ibf4be58231d29cd972eb765f32b410e1eb9d7fed
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-11-01 01:40:47 +01:00
Sami Nurmenniemi
6aea1a22ee Added RDS functionality to the QRadioTuner/QDeclarativeRadio
Change-Id: I865e3caba82977002cf1f01f1d64ee0a42de77c6
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2011-10-21 03:40:14 +02:00
Michael Goddard
03f22bcdaf Rename QtMultimediaKit to QtMultimedia.
There are a few legacy bits left in place so it passes CI, and
then qt5.git etc can be updated.

Change-Id: I6b082e50e6958c72fdabc2974992e16d90dafa3a
Reviewed-on: http://codereview.qt-project.org/5368
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2011-10-07 06:16:34 +02:00