summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Update plugins.qmltypesKai Koehne2012-12-071-224/+63
| | | | | | | | Run with option nonrelocatable. Change-Id: I689d5d745dac9325aeb5db81484054b0dcdb9d24 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Fix compilation with -no-rtti.Friedemann Kleint2012-11-191-1/+4
| | | | | | | | Availability of dynamic_cast should be checked. Task-number: QTBUG-27939 Change-Id: I24c0bca7859a45c6be89c507dadd91e7175939e0 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Blackberry: Enable support for audioengine if availableThomas McGuire2012-11-071-1/+2
| | | | | | | | BB10 ships OpenAL, so the audio engine works there. Change-Id: I49ba6201788cb41cabb1670522dc97a36fd5f2c2 Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix the bufferProgress property of QDeclarativeAudioAndras Becsi2012-11-071-1/+1
| | | | | | | | | | | | The bufferProgress property of QDeclarativeAudio is documented to hold how much of the data buffer is currently filled, from 0.0 (empty) to 1.0 (full) and should be declared to be of type qreal instead of int. The implementation was correctly normalizing the buffer status percentage to the [0, 1] range but the returned value was truncated to int in QML because of the faulty property declaration. Change-Id: I494c9cd14f4b3ec511759ae66a50e9f96bcb1452 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Rename namespace QtMultimedia -> QMultimediaSze Howe Koh2012-11-0611-38/+38
| | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Mass find+replace "QtMultimedia::" -> "QMultimedia::" 2. Hand-modified declaration in qtmedianamespace.h/cpp For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I1fbc43a1aa91d996aa61869fcd8d05186bf7cf6d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Rename namespace QtMultimedia::MetaData -> QMediaMetaDataSze Howe Koh2012-11-064-208/+208
| | | | | | | | | | | | | | | | | | Main code, examples, tests and docs updated. Method: 1. Remove unused forward-declarations, "class QMediaMetaData" 2. Mass find+replace "QtMultimedia::MetaData" -> "QMediaMetaData" 3. Un-nest from the QtMultimedia namespace in qtmedianamespace.h For consistency (with minimal disruption), namespaces with a "Qt" prefix will be renamed. Also, Qt guidelines don't include nested namespaces (http://lists.qt-project.org/pipermail/development/2012-October/006756.html) Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: I40e59c1cf58c1792725e735e9285c51bc5f226b1 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix the QML list interfaceFriedemann Kleint2012-10-242-2/+2
| | | | | | | | | | | | | The QML list interface was changed, so that there is now a read only constructor and the default properties are removed. This is because the original interface was very runtime centric, like other parts in QML. The new interface was changed for the needs of the QML designer and debugger. Task-number: QTBUG-9390 Change-Id: Ia61a2457432b4fc5c0cf440eeebd9d3a6c4c6463 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Compile after removal of compatibility code in QtQuick.Friedemann Kleint2012-10-161-3/+3
| | | | | | | | | qtdeclarative: f21e9ba6efa2b1c8169491db271f79b87b5b0ce4 removed QQuickCanvas. Change-Id: Ica8ae4d816d1ca08f08d299cec741837a1a77c50 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix issue sharing OpenGL context from render thread on OS XAndy Nichols2012-10-092-1/+24
| | | | | | | | | | | 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>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2466-1582/+1582
| | | | | | | | | 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>
* Fix compilation after the qreal->float change in Math3DThiago Macieira2012-09-121-1/+1
| | | | | | | | QVector3D::length() returns float now, so this qBound call was running into template substitution failure. Change-Id: Ib03ab96bf18a4b04fa80a8f706761329faab2541 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Hide the video overlay when the QML element is hiddenThomas McGuire2012-09-062-3/+15
| | | | | | | | An display invalid rect is used for invisible QML items. Change-Id: Ifb2a25f1c5387ab8cef1359ac6c3e2f90a42cd10 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
* Doc: Added an index page and separated \qmlproperty and \property documentationVenugopal Shivashankar2012-08-297-146/+340
| | | | | | Change-Id: I29bcfd0a31c781deb4cce2d6bcb2afca32191ae6 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com> Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Set the Qt API level to compatibility mode in all tests.Thiago Macieira2012-08-011-0/+2
| | | | | | | | | | 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>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-2721-23/+45
| | | | | | | | | -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>
* Fixed QDoc errors related to snippets and quotefromfile commandsVenugopal Shivashankar2012-07-263-4/+7
| | | | | Change-Id: I9dd6381eb95dcbd9aa5cc8f596d87cf55eee7427 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Fixed the QDoc errors related to \qmlproperty usageVenugopal Shivashankar2012-07-242-2/+2
| | | | | | Change-Id: Ie4d5f8698fe8a1a774fd8f0bb127c20fc63a14e3 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com> Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Removed the playbackStateChanged signal from Video elementDmytro Poplavskiy2012-07-191-9/+0
| | | | | | | It conflicts with Video.playbackState property notifications Change-Id: I47901547e9db6f2b71e25c05ca8ce24c402eb5a2 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fix QQuickCanvas renames.Toby Tomkins2012-07-181-2/+2
| | | | | | | | This is required because of name changes to QtDeclarative in the commit feb996e3ab44e68082c97102556ea396f5df3f44. Change-Id: Ia40b1ea1cf3b3cb5225b7678077b627b74c47132 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Fix for broken QML multimedia import on windowsMithra Pattison2012-07-161-2/+2
| | | | | | | | | | | 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>
* Fix a crash problem in AudioEngine due to class name change.Ling Hu2012-07-131-1/+1
| | | | | Change-Id: I18a831ffc692b5aa6de6e2626f0dc916eb57c8b7 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* use centralized qml plugin project handlingOswald Buddenhagen2012-07-113-95/+5
| | | | | | Change-Id: If9561a27d9b96d020e2ffcf2dcc6deedb4d89e4a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Delete obsolete class methods and update related codeMithra Pattison2012-07-101-1/+1
| | | | | | | | Delete obsolete methods from QAudioFormat and QAudioDeviceInfo and update code that relied on the obsolete methods. Change-Id: I007e36375a45399b1d5a289341bc5d5a05dc68cc Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Fixed QML video playback on MacDmytro Poplavskiy2012-06-295-0/+352
| | | | | | | | | | | | 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>
* Rename availabilityError to availability.Michael Goddard2012-06-299-41/+35
| | | | | | | It's perhaps clearer in the usual case. Change-Id: Id3cef82ac83f8c9b538b3315281664ce1c6a2b96 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Fix header path for audio engine on Mac.Michael Goddard2012-06-272-5/+9
| | | | | | | There's a different prefix here. Change-Id: Ifda82e19824801b1d903ab6ad40c97428fff236c Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* switch to new-style configure testsOswald Buddenhagen2012-06-251-1/+1
| | | | | Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Add default initialisation to various multimedia classesMithra Pattison2012-06-252-4/+11
| | | | | Change-Id: I902de05984fdae152e2678e4cf2d401a0b670703 Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
* Fix namespace compilation.Toby Tomkins2012-06-252-4/+2
| | | | | | Change-Id: Id8d71a48df20da16647834e8f9732012f26f928f Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add the QtBase/lib directory as a library path, not just frameworks.Michael Goddard2012-06-251-1/+1
| | | | | | | | 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>
* Fix a number of other qdoc issues.Michael Goddard2012-06-1521-233/+211
| | | | | | | | | | | | | | * 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>
* Replace a writable position() property with a seek() method.Michael Goddard2012-06-142-23/+50
| | | | | | | | 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>
* Updating brief layout of QML typesAngus Cummings2012-06-1419-21/+21
| | | | | | Change-Id: I1dcd7bf7427f25bb9e19cbe3c7e17808b0fc9708 Reviewed-by: Michael Goddard <michael.goddard@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* Renaming StopppedState to StoppedStateAngus Cummings2012-06-135-10/+10
| | | | | Change-Id: Ib23e9795960f40b46c0b2441ec03e8b1812033e5 Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
* Remove the legacy QML API.Michael Goddard2012-06-0811-2189/+322
| | | | | | | | 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>
* A number of documentation fixes.Michael Goddard2012-06-073-6/+6
| | | | | | | | | | | | | | * 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>
* Use QPointer instead of QWeakPointer to track QObjects.Stephen Kelly2012-06-071-3/+4
| | | | | | | The latter is to be deprecated. Change-Id: I01998be880feba0819a9bc51f9bec48fd4601789 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Call the base QQuickItem geometryChanged function in our override.Michael Goddard2012-06-051-0/+2
| | | | | | | | 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>
* Fixing doc errors in MediaPlayer and CameraFlashAngus Cummings2012-06-012-77/+678
| | | | | | | | | 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>
* Added missing QDeclarativeCamera::CaptureViewfinder enum valueDmytro Poplavskiy2012-05-182-0/+4
| | | | | Change-Id: I75844e3a943a76649d1b51f0c845a4bf8b200a8e Reviewed-by: Ling Hu <ling.hu@nokia.com>
* QML VideoOutput: don't keep video frames for more than necessaryDmytro Poplavskiy2012-05-162-17/+31
| | | | | | | | 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>
* Expose camera status to QML Camera elementDmytro Poplavskiy2012-05-162-0/+75
| | | | | | | | 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>
* Minor doc fixes for QMLAngus Cummings2012-05-1622-195/+231
| | | | | | | | | | 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>
* Fixed QML Camera errors reportingDmytro Poplavskiy2012-05-142-8/+27
| | | | | | | | Added missing connection to QCamera::error() signal Added Camera.errorCode property Change-Id: Ie0dd71d760b4b5b79b2aefaba97bc383ef2a9750 Reviewed-by: Ling Hu <ling.hu@nokia.com>
* Improved QDeclarativeCameraRecorder errors reportingDmytro Poplavskiy2012-05-142-6/+35
| | | | | | | | | | | 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>
* Don't use QtDeclarative compat moduleKent Hansen2012-05-143-3/+3
| | | | | | | Use QtQml instead. Change-Id: I7618ba89a2ed288f7043ae402ac091a924598f03 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Support QVideoWindowControl in the QtQuick Video element.Thomas McGuire2012-05-038-252/+804
| | | | | | Change-Id: I953899a3ec92856955d36528057b0d45f9c26394 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
* Added QMediaRecorder::status propertyDmytro Poplavskiy2012-05-022-0/+50
| | | | | | | | | | | | | 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>
* Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.Friedemann Kleint2012-04-247-22/+22
| | | | | | | Remove QDeclarative compatibility module code. Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Change Video and VideoOutput docs to mention ScreenSaverAngus Cummings2012-04-162-0/+26
| | | | | Change-Id: If7a03e9eafd351eec484a568802c75d955b68ecf Reviewed-by: Michael Goddard <michael.goddard@nokia.com>