Commit Graph

140 Commits

Author SHA1 Message Date
Friedemann Kleint
a410276d0d Compile after removal of compatibility code in QtQuick.
qtdeclarative: f21e9ba6efa2b1c8169491db271f79b87b5b0ce4
removed QQuickCanvas.

Change-Id: Ica8ae4d816d1ca08f08d299cec741837a1a77c50
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-10-16 16:08:20 +02:00
Andy Nichols
bc7e9fe7c7 Fix issue sharing OpenGL context from render thread on OS X
On OS X when running in QtQuick 2 examples in debug mode we fail an
assert because we try to set a dynamic property using
QObject::setProperty from the render thread, while the object exists in
the main thread.  Now we call setProperty from the correct thread.

Change-Id: I3f26ead0f68fadcded472bf5c9014a4025f0a03e
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Jason Barron <jason.barron@digia.com>
2012-10-09 13:46:31 +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
Thomas McGuire
bce8b5486d Hide the video overlay when the QML element is hidden
An display invalid rect is used for invisible QML
items.

Change-Id: Ifb2a25f1c5387ab8cef1359ac6c3e2f90a42cd10
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
2012-09-06 14:56:34 +02:00
Venugopal Shivashankar
a4c23ac607 Doc: Added an index page and separated \qmlproperty and \property documentation
Change-Id: I29bcfd0a31c781deb4cce2d6bcb2afca32191ae6
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
Reviewed-by: Martin Smith <martin.smith@nokia.com>
2012-08-29 13:17:52 +02:00
Thiago Macieira
8e49af7ef5 Set the Qt API level to compatibility mode in all tests.
Qt 5.0 beta requires changing the default to the 5.0 API, disabling
the deprecated code. However, tests should test (and often do) the
compatibility API too, so turn it back on.

Task-number: QTBUG-25053
Change-Id: I9589f57998af237f2e89c7799789dae5a13ef634
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2012-08-01 22:27:40 +02:00
Jerome Pasion
011e151c4e Doc: Changed \qmlclass to \qmltype and added \instantiates
-New qdoc command \qmltype replaces \qmlclass
-\instantiates <C++ class> for determining if the QML type has a C++
implementation

Change-Id: I83d1e2c3f376f96ea51afedadf88c3cf478e33d8
Reviewed-by: Martin Smith <martin.smith@nokia.com>
2012-07-27 14:56:32 +02:00
Venugopal Shivashankar
6ebee9f57e Fixed QDoc errors related to snippets and quotefromfile commands
Change-Id: I9dd6381eb95dcbd9aa5cc8f596d87cf55eee7427
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
2012-07-26 11:51:31 +02:00
Venugopal Shivashankar
79107a3899 Fixed the QDoc errors related to \qmlproperty usage
Change-Id: Ie4d5f8698fe8a1a774fd8f0bb127c20fc63a14e3
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-24 07:58:20 +02:00
Dmytro Poplavskiy
6854f07257 Removed the playbackStateChanged signal from Video element
It conflicts with Video.playbackState property notifications

Change-Id: I47901547e9db6f2b71e25c05ca8ce24c402eb5a2
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-19 09:08:48 +02:00
Toby Tomkins
b95f608612 Fix QQuickCanvas renames.
This is required because of name changes to QtDeclarative in the commit
feb996e3ab44e68082c97102556ea396f5df3f44.

Change-Id: Ia40b1ea1cf3b3cb5225b7678077b627b74c47132
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-07-18 05:11:00 +02:00
Mithra Pattison
858baa7d90 Fix for broken QML multimedia import on windows
Changed qtmultimediaquicktools into a module so that it gets installed
to the bin directory. This allows the declarative_multimedia library
to locate it during the 'import multimedia' process.

Task-number: QTBUG-25984

Change-Id: I559469170bc713fb31633917bcbc210f862660cf
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-07-16 08:40:43 +02:00
Oswald Buddenhagen
d18eadc8ab use centralized qml plugin project handling
Change-Id: If9561a27d9b96d020e2ffcf2dcc6deedb4d89e4a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-11 23:48:23 +02:00
Dmytro Poplavskiy
f9516c4c5b Fixed QML video playback on Mac
Use the same CIImage based video frames as with
QGraphicsVideoItem, but since CIImages can't be
rendered directly in Scene Graph,
the frame is rendered to FBO first.

Task-number: QT-5423
Change-Id: I16f7e6351578bae21f8642a8028538c441e1f544
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-06-29 08:59:53 +02:00
Michael Goddard
b0809c027c Rename availabilityError to availability.
It's perhaps clearer in the usual case.

Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-06-29 02:47:41 +02:00
Mithra Pattison
5705f70da1 Add default initialisation to various multimedia classes
Change-Id: I902de05984fdae152e2678e4cf2d401a0b670703
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-06-25 06:39:11 +02:00
Michael Goddard
89898e4499 Add the QtBase/lib directory as a library path, not just frameworks.
This meant that any non-framework libraries there weren't found (like
the multimedia helper libraries).

Change-Id: Iacd99f82763d39fc47c779c9498dfd5e1cc0e743
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-06-25 06:38:56 +02:00
Michael Goddard
6931cbb35a Fix a number of other qdoc issues.
* Several places needed the forward class declaration hack
* Missing/wrong minor version numbers on imports
* A few typos
* Any number of attempts to work around qdoc
* A few missing docs
* Tweaked soundeffect docs

Change-Id: I3c2ab998a11cbb0956712e0423e01fdb70f5bfff
Reviewed-by: Peter Yard <peter.yard@nokia.com>
Reviewed-by: Angus Cummings <angus.cummings@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-06-15 08:49:29 +02:00
Michael Goddard
c88abd0177 Replace a writable position() property with a seek() method.
Seeking is sometimes asynchronous, and more importantly nearly every
one using a slider for seeking ends up with a binding loop.

Change-Id: I45d92e19b0276c8b97c51c073754d1c9d3dc611e
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-06-14 05:42:49 +02:00
Angus Cummings
940ef93c30 Updating brief layout of QML types
Change-Id: I1dcd7bf7427f25bb9e19cbe3c7e17808b0fc9708
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
2012-06-14 05:42:49 +02:00
Michael Goddard
342b8b9be5 Remove the legacy QML API.
This means no version 4.0 (which was never released) and no
Qt.multimediakit alternative import.

Change-Id: Iaacf047b0d72381a4a8cd975e036135ed11ea383
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-06-08 07:53:23 +02:00
Michael Goddard
f53788ae42 A number of documentation fixes.
* Remove references to private QMediaServiceProvider class and point
  new backend writers to irc/mailing lists
* Wrong or missing parameter names
* Fix a few links
* Correct a few property data types
* Various other things to keep qdoc happier

Change-Id: I5c8800d65c00f0783541afef35990bd3918acab7
Reviewed-by: Angus Cummings <angus.cummings@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Daniel Kovacic <daniel.kovacic@nokia.com>
2012-06-07 07:05:57 +02:00
Stephen Kelly
b93032a7df Use QPointer instead of QWeakPointer to track QObjects.
The latter is to be deprecated.

Change-Id: I01998be880feba0819a9bc51f9bec48fd4601789
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-06-07 02:17:22 +02:00
Michael Goddard
aae2e2104b Call the base QQuickItem geometryChanged function in our override.
Otherwise you get strange errors like the width/height of a
VideoOutput element are 0.

Change-Id: Ib123112b513f5ed2f0ce24da6dbfe00e20551d74
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-06-05 06:12:03 +02:00
Angus Cummings
e063610527 Fixing doc errors in MediaPlayer and CameraFlash
properties were not showing up for either type. There were
namespace errors in flash, and mediaplayer docs needed to
be copied from audio.

Change-Id: I53fa721ec9e0cfa1aee3586c7e3eb608b9a1b465
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
2012-06-01 06:35:41 +02:00
Dmytro Poplavskiy
f965f683d0 Added missing QDeclarativeCamera::CaptureViewfinder enum value
Change-Id: I75844e3a943a76649d1b51f0c845a4bf8b200a8e
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-05-18 05:28:32 +02:00
Dmytro Poplavskiy
3b88e105f8 QML VideoOutput: don't keep video frames for more than necessary
The frame can be released as soon as it pushed to video node.

Change-Id: Ib2621cc2a001629e722bf15b6e1ca09323170870
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-05-16 07:07:28 +02:00
Dmytro Poplavskiy
be6d80e57a Expose camera status to QML Camera element
It's exposed as Camera.cameraStatus property.

Change-Id: Id3b477266d3a666b7a2a61cd4579f0e3f873d3b8
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-05-16 07:07:28 +02:00
Angus Cummings
9e6d03584a Minor doc fixes for QML
renaming QML element to QML type
removing some \fn tags that were making the docs not build
some rewording
some new signal docs

Change-Id: I9b350dad1780276959aef4105e53b91082a6083e
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-05-16 05:21:25 +02:00
Dmytro Poplavskiy
08d45baac2 Fixed QML Camera errors reporting
Added missing connection to QCamera::error() signal
Added Camera.errorCode property

Change-Id: Ie0dd71d760b4b5b79b2aefaba97bc383ef2a9750
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-05-14 08:37:41 +02:00
Dmytro Poplavskiy
112820ef46 Improved QDeclarativeCameraRecorder errors reporting
Added QDeclarativeCameraRecorder::Error enum to allow
specify error codes as CameraRecorder.FormatError.

Added QDeclarativeCameraRecorder::errorCode property.

Change-Id: Iac5522c3110591493b98e59db18dbfc2d3b7496f
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-05-14 08:37:30 +02:00
Kent Hansen
68680fc661 Don't use QtDeclarative compat module
Use QtQml instead.

Change-Id: I7618ba89a2ed288f7043ae402ac091a924598f03
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-05-14 05:34:32 +02:00
Thomas McGuire
025f4d2ee1 Support QVideoWindowControl in the QtQuick Video element.
Change-Id: I953899a3ec92856955d36528057b0d45f9c26394
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-05-03 10:34:10 +02:00
Dmytro Poplavskiy
b7935a84d7 Added QMediaRecorder::status property
QMediaRecorder::state property represents the user request and
changed synchronously during record(), pause() or stop() calls.

Recorder status is changed asynchronously
and represents the actual status of media recorder.

This also makes API more consistent with QMediaPlayer and QCamera.

Change-Id: I80b4aaa70bb88e555c492908da8c29d0fc5ed5ea
Reviewed-by: Ling Hu <ling.hu@nokia.com>
2012-05-02 03:15:01 +02:00
Friedemann Kleint
5ae3adcfa9 Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.
Remove QDeclarative compatibility module code.

Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-24 11:47:54 +02:00
Angus Cummings
c7b02bad92 Change Video and VideoOutput docs to mention ScreenSaver
Change-Id: If7a03e9eafd351eec484a568802c75d955b68ecf
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-04-16 10:56:34 +02:00
Lev Zelenskiy
3d89cae052 QDeclarativeVideoOutput: correctly disconnect _q_updateMediaObject
Fixed a bug where _q_updateMediaObject() slot wasn't disconnected
correctly.

Change-Id: I45696fc850dc59ff6f1cc45da15b87c280c29088
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-04-16 09:44:40 +02:00
Thomas McGuire
72316a4ea8 Use QtMultimedia 5.0 in the QML Video element doc.
Change-Id: I5e549b321a549d2b4abc058cf08d81329df3562e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-04-13 03:28:26 +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
Jonas Rabbe
c532850fd1 Updated a lot of minor fixes to the docs and removed warnings from qdoc
Change-Id: Ib7fd75fb93c038f9e8fa9d71b6ad01fb27b97622
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-04-05 03:54:02 +02:00
Jonas Rabbe
7c57a7c412 Add typeinfo for the declarative plugin for Qt Multimedia
For Qt Creator to correctly typecheck and auto-complete QML types and
objects, the typeinfo must be exported and added to the qmldir file.
This patch contains those changes, and an update to make updating the
typeinfo file easier in the future.

Change-Id: I988f22d3ca81839662cce4aed9d5297f7c5fbf32
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-04-04 05:29:04 +02:00
Jonas Rabbe
6c2f9f0f52 Moved video plugins around to prevent accidental unloading
If several different plugins are located in the same place, and are
loaded by different instances of QFactoryLoader, like we use, then
plugins that are used elsewhere can be unloaded.
By ensuring that the plugins are alone in their directory, then
they will not have this problem.

Change-Id: Id95b81ddf46435278fe43a4769e2d39f6b973a84
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Reviewed-by: Mithra Pattison <mithra.pattison@nokia.com>
2012-04-02 00:33:14 +02:00
Andrew den Exter
655408bced Don't delete video node factories owned by the plugin loader.
Make the fallback factories members instead of creating on the
heap so there's no need to delete members of the m_videoNodeFactories
some of which may be shared with other current and future video
outputs.

Change-Id: I3d2e32e52479b12ff64e31a2ed527336d94a191b
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-03-23 07:41:52 +01:00
Angus Cummings
5d6494f248 resolving some warnings in qtmultimedia docs
Change-Id: I9df926f64548a5d53382448ca4eef8d428339aa3
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-03-22 06:47:05 +01:00
Dmytro Poplavskiy
8477d735c9 Added VideoLight camera flash mode.
Unlike the torch mode, it's enabled only while camera is active.

Change-Id: Ib92349ac190586c5aa8e49a8fddbdf937e757fd0
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-03-22 06:47:05 +01:00
Thomas Senyk
b816a640a9 changing include from qdeclarativeinfo to qmlinfo in qdeclarativeaudio.cpp
Change-Id: I7244f6c7b3743dfe5532f1d13c2afef256a2cdbc
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
2012-03-21 22:25:33 +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
3f73ddbc71 Fixed the qml Camera.imageCapture.imageExposed signal connection
Trivial fix.

Change-Id: I522e3186ce9284e3aa0fb84296bc3c1e663e8577
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
2012-03-20 01:07:46 +01:00
Michael Goddard
e9ebbeef72 Make QDeclarativeAudio use QMediaPlayer instead of the controls.
Very minor changes in semantics due to previous differences:
* negative positions are not supported any more (clamped to >= 0)
* setting muted to the same value previously set to the control itself
  won't signal any more.

Change-Id: Iacf4310508d853ae82b63dee28095fce12b6ff28
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-03-16 06:58:46 +01:00
Michael Goddard
7c0b1da0ed Merge the QDeclarativeMediaBase and QDeclarativeAudio classes.
Since there is only one subclass of base.

Next step is to clean up QDeclarativeAudio

Change-Id: Ibda8c3006efa165b58372a011121f04a39458562
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
2012-03-16 05:38:11 +01:00