Sze Howe Koh [Wed, 31 Oct 2012 16:53:20 +0000 (00:53 +0800)]
Enable the "#include <QAudio>" camel-case header (regression)
The header was available in Qt 4, but somehow went missing.
Change-Id: I5e54921afd6e196d67db797331a0b0093f41ce34
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Sze Howe Koh [Wed, 31 Oct 2012 16:42:35 +0000 (00:42 +0800)]
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>
Sze Howe Koh [Wed, 31 Oct 2012 16:33:21 +0000 (00:33 +0800)]
Rename namespace QtMultimedia -> QMultimedia
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>
Sze Howe Koh [Wed, 31 Oct 2012 16:05:13 +0000 (00:05 +0800)]
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>
Sze Howe Koh [Wed, 31 Oct 2012 11:37:48 +0000 (19:37 +0800)]
Rename namespace QtMultimedia::MetaData -> QMediaMetaData
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>
Oswald Buddenhagen [Wed, 24 Oct 2012 13:33:02 +0000 (15:33 +0200)]
adjust to qt_plugin.prf changes
DESTDIR and INSTALLS+=target are set up automatically now. note that in
the qmediaserviceprovider test we must override that.
also, TARGET munging is done automatically.
Change-Id: Ida5d5601e22b099134d1ec07ace713e0d0986bd6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Oswald Buddenhagen [Fri, 2 Nov 2012 16:44:25 +0000 (17:44 +0100)]
fix VPATH
the code relied on the now removed qmake misfeature of adding DEPENDPATH
to VPATH.
Change-Id: I3bea30a25776eb945fbd65f9e9811c91d882893f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Sergio Ahumada [Wed, 31 Oct 2012 21:19:06 +0000 (22:19 +0100)]
test: Mark tst_QSoundEffect as insignificant
Task-number: QTBUG-26509
Task-number: QTBUG-26748
Change-Id: Id8952c2ed3e2a261907eed1e160fc187af6983ce
Reviewed-by: Rohan McGovern <rohan@mcgovern.id.au>
Stephen Kelly [Wed, 31 Oct 2012 13:54:11 +0000 (14:54 +0100)]
CMake: Remove obsolete test_modules test
The generated module_includes test is a super-set of this test.
Change-Id: I33d665a38d664c049028519d73dfad912fc22a1f
Reviewed-by: Rohan McGovern [inactive] <rohan.mcgovern@nokia.com>
Stephen Kelly [Mon, 29 Oct 2012 09:34:41 +0000 (10:34 +0100)]
CMake: Test module includes
Change-Id: I1676efff8071fa0fae13bb484a5e18928e35f663
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Sergio Ahumada [Thu, 25 Oct 2012 16:41:01 +0000 (18:41 +0200)]
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>
Friedemann Kleint [Wed, 24 Oct 2012 08:48:22 +0000 (10:48 +0200)]
Fix the QML list interface
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>
Maurice Kalinowski [Mon, 15 Oct 2012 18:32:17 +0000 (20:32 +0200)]
add install path to rule
fix installation into prefix directory.
Change-Id: I6838589e2e186d4f23d240e0e7c2772a46af3a9d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Caroline Chao [Fri, 19 Oct 2012 12:34:38 +0000 (14:34 +0200)]
Fix for QuickTime 7 media player backend
Fix build on Mac 10.6 (32bits)
Task-number: QTBUG-27179
Change-Id: If0b83605650966bf801b5fbb06d02c113d0b4214
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Andy Nichols [Mon, 1 Oct 2012 08:20:19 +0000 (10:20 +0200)]
Add MediaPlayer support to AVFoundation plugin
This plugin would be used on Mac 10.7+ where without the QuickTime C API
our QT7 media player performance was crippled.
Change-Id: Iaadb1990a8f63393c4cd02d096624e0fed42b40f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jason Barron <jason.barron@digia.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Venugopal Shivashankar [Thu, 18 Oct 2012 12:17:45 +0000 (14:17 +0200)]
Doc: Removed dependency on qtmultimedia.css
All module documentation must use the global HTML template and style
sheet in qtbase\doc\global.
Change-Id: Ia7db9373f2291052924f433223a128ef4c2c3df8
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Yoann Lopes [Thu, 11 Oct 2012 17:19:31 +0000 (19:19 +0200)]
Make QGstreamerPlayerSession 'VAAPI-aware'.
At the moment the GStreamer player pipeline is not setup properly when
the VAAPI plugin is available, resulting in no video being shown.
Added 'video/x-surface' as one of the default raw formats for the
decodebin.
Don't use vaapidecode when the video sink is not compatible.
This is a preliminary patch to support VAAPI. In the current state
vaapidecode will never be used as none of our video sinks support the
video/x-surface format.
Change-Id: I39f339b483d4052dd1e29c2b0ef06343d5670224
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Friedemann Kleint [Wed, 17 Oct 2012 08:11:25 +0000 (10:11 +0200)]
QtMultimedia: Fix compiler warnings.
Change-Id: I5783b1f6dce645fb473e7d3da0911dbb40e3951b
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Friedemann Kleint [Tue, 16 Oct 2012 14:49:52 +0000 (16:49 +0200)]
Fix compilation with stock MinGW.
Use qt_windows.h, provide interfaces and UIDs missing
in stock MinGW.
Task-number: QTBUG-23829
Change-Id: I79ed902bb7636c751df7607f6059a7de237acb31
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Friedemann Kleint [Tue, 16 Oct 2012 13:46:46 +0000 (15:46 +0200)]
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>
Caroline Chao [Fri, 12 Oct 2012 13:22:14 +0000 (15:22 +0200)]
Remove unused value in qvideowidget.cpp
Following change:
439d5b0e53f564dc75e427743ccce75c6a62f1c6
Change-Id: I111a87578844bb3c18819285ae9509e0f2c408d9
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Andy Nichols [Tue, 9 Oct 2012 11:54:15 +0000 (13:54 +0200)]
Don't run the Linux configure tests on OS X
This can create weird senarios where they pass due to MacPorts actually
having the dependencies. We don't support this, so dont allow it to
happen.
Task-number: QTBUG-27352
Change-Id: I2be104549b5d1e9a61a734d05b3c21afcd2f6828
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Andy Nichols [Wed, 10 Oct 2012 13:36:19 +0000 (15:36 +0200)]
Enable the auto test script to run on OS X
Only a few test could be run on OS X because they were not stored in an
application bundle. Now on OS X we check for the application bundle for
a test in the runautotests.py script.
Change-Id: If9e3f343f5005ecfe4a83d8282564d1309b4379e
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: Jason Barron <jason.barron@digia.com>
Tor Arne Vestbø [Thu, 11 Oct 2012 13:23:49 +0000 (15:23 +0200)]
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>
Jędrzej Nowacki [Wed, 10 Oct 2012 16:43:25 +0000 (18:43 +0200)]
Build fix after a QVariant change
QVariant(Qt::GlobalColor) ctor was removed in Qt5.
Change-Id: If272ff26003cdc58eb3decf5030e927134d126b0
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Andy Nichols [Mon, 8 Oct 2012 15:37:44 +0000 (17:37 +0200)]
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>
Andy Nichols [Fri, 17 Aug 2012 01:19:17 +0000 (11:19 +1000)]
Added config test for AVFoundation framework
Change-Id: Ifd152513074e6b7802a3ed6d4722ba78762ec79c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Dmytro Poplavskiy [Tue, 28 Aug 2012 03:47:30 +0000 (13:47 +1000)]
Fixed AVF camera backend build with namespaced Qt
Objective-C declarations may only appear in global
scope, moved them out of Qt namespace
Change-Id: Icb136be75f544e5929ac28f0ba0681211b81a983
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Kevin Ottens [Thu, 30 Aug 2012 13:41:34 +0000 (15:41 +0200)]
Export QAudioHelperInternal symbols
They can be useful to some of the audio plugins.
Change-Id: I10856c104770ed57c72b674829e3922b5067a822
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Kevin Ottens [Thu, 30 Aug 2012 13:43:13 +0000 (15:43 +0200)]
Don't add the beginning of the file to the end of the last period
If we're in the last loop, it is not necessary to provide a full period
on read. Just provide the remaining of the data and hit the end of the
stream by returning less than requested, otherwise we potentially
generate some garbage noise.
Change-Id: I9d3a632ddc0c3289957c9f876d5dbe2999b50ebd
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Kevin Ottens [Mon, 13 Aug 2012 14:39:09 +0000 (16:39 +0200)]
Blackberry: Move the mediaservice plugin in a subdirectory
Move the current platform plugin content in a subdir in order to make
room for several plugins (at least an extra one will be needed for the
audio type).
Change-Id: If17d6a464e36014fbefda52ddb0e8f8a58697f48
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Jerome Pasion [Wed, 3 Oct 2012 14:24:48 +0000 (16:24 +0200)]
Doc: Added Qt Multimedia to 'qmlmodules' group
-'qmlmodules' contains Qt's QML API
-made brief description consistent with other QML API
Change-Id: I30473048b06e2a4e13deb57c394a12c51a11693b
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Yoann Lopes [Mon, 1 Oct 2012 15:50:55 +0000 (17:50 +0200)]
Use QVideoGraphicsItem in the videographicsitem example.
The videographicsitem example now uses QVideoGraphicsItem instead of a
custom QAbstractVideoSurface.
The old code has been moved to a new example:
"customvideosurface/customvideoitem".
Change-Id: I83212f36168ef94d670b447eb1a742a39753939d
Reviewed-by: Jason Barron <jason.barron@digia.com>
Yoann Lopes [Fri, 28 Sep 2012 15:53:11 +0000 (17:53 +0200)]
QVideoWidget: fixed setFullScreen(false) on the Xcb platform.
Fixed exiting fullscreen when a QVideoWidget is embedded in another QWidget.
Requires change I3616dc0f in qtbase to work.
Because of a bug in some X window managers, the order in which
setWindowFlags() and showNormal() are called has been changed.
Change-Id: I335d47a3a1d9ce517978cad35597d72312150db1
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Venugopal Shivashankar [Fri, 28 Sep 2012 10:00:27 +0000 (12:00 +0200)]
Doc: Organized related information in subsections
Change-Id: Iabe4a032d998003b659e298c3d602d68d83de8b1
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Sergio Ahumada [Thu, 27 Sep 2012 09:33:42 +0000 (11:33 +0200)]
Add missing QT_{BEGIN,END}_NAMESPACE
Change-Id: I85bbd4f711191c14d6f58f098fced7336c66308f
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Venugopal Shivashankar [Wed, 26 Sep 2012 15:12:01 +0000 (17:12 +0200)]
Doc: Moved example documentation and images
Changed to adhere to the new documentation structure
outlined here:
http://qt-project.org/wiki/Qt_Documentation_Structure
Change-Id: I634e086c7d55abfac3680144cbbe97059fcbea4f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Yoann Lopes [Tue, 25 Sep 2012 14:58:44 +0000 (16:58 +0200)]
Use QVideoWidget in the videowidget example.
The videowidget example now uses QVideoWidget instead of a custom
QAbstractVideoSurface, the former being the most straightforward and
fastest way of showing a video in a QWidget.
The old code has been moved to a new example: "customvideosurface".
Change-Id: I15fb4482d0e77bafd24d4cb03316fc8f4ef13c35
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jason Barron <jason.barron@digia.com>
Jerome Pasion [Fri, 21 Sep 2012 12:20:50 +0000 (14:20 +0200)]
Doc: Adding documentation templates from qtbase
Task-number: QTBUG-27293
Change-Id: I86ca7bbb5bb2899617f3a2afb56183110666f71a
Reviewed-by: Martin Smith <martin.smith@digia.com>
Iikka Eklund [Mon, 24 Sep 2012 05:27:03 +0000 (08:27 +0300)]
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>
Andy Nichols [Sun, 23 Sep 2012 12:36:51 +0000 (14:36 +0200)]
Fix missing internal module in sync.profile
Build was broken for shadow builds because qtmultimediaquicktools
was not listed in sync.profile
Change-Id: If9d23906dbd37b651a545ae810ee9883b6a23348
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Romain Pokrzywka [Thu, 13 Sep 2012 18:17:23 +0000 (11:17 -0700)]
Fix gstreamer plugin build for platforms with qreal -> float
simple case of qFuzzyCompare with double and float.
I kept m_volume as double rather than changing it to float, to mimic
the behavior of the mute variable.
Change-Id: Ife2f58f60738215ebd430ba94bef885c09994e72
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
Venugopal Shivashankar [Thu, 6 Sep 2012 15:41:54 +0000 (17:41 +0200)]
Doc: Updated landing page to be consistent with other module landing pages
Change-Id: Ib230a7c01f2573b08f0a505fb0ada80d01757ba7
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Venugopal Shivashankar [Tue, 11 Sep 2012 14:20:55 +0000 (16:20 +0200)]
Doc: Removed the unnecessary \annotatedlist command to avoid duplication
Change-Id: I5b1b42ed2b94735ff758e0e93e8df8eb5ab73a0f
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Joerg Bornemann [Mon, 10 Sep 2012 15:11:07 +0000 (17:11 +0200)]
remove usage of QT_MAKEDLL from QtMultimedia
Change-Id: Ie427497c999c6d8d666b21cc5cc079036c505cc6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Oswald Buddenhagen [Tue, 11 Sep 2012 11:03:14 +0000 (13:03 +0200)]
remove references to qMemSet & qMemCopy
Change-Id: Ie6e24798368305fb1eaa01d0e5fccdb5bb5aa33b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Oswald Buddenhagen [Mon, 3 Sep 2012 10:10:27 +0000 (12:10 +0200)]
centralize load(qt_build_config)s in .qmake.conf
Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Thiago Macieira [Wed, 12 Sep 2012 10:29:25 +0000 (12:29 +0200)]
Fix compilation after the qreal->float change in Math3D
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>
Thomas McGuire [Wed, 5 Sep 2012 11:34:03 +0000 (13:34 +0200)]
Blackberry: Add Q_DECL_OVERRIDE keywords
Change-Id: Ibd6cf76ac41e16cbf65182994d68eb81c315f0af
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Thomas McGuire [Wed, 5 Sep 2012 11:25:03 +0000 (13:25 +0200)]
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>
Thomas McGuire [Wed, 5 Sep 2012 11:45:05 +0000 (13:45 +0200)]
Blackberry: Use debug output for errors by default
This makes diagnosing problems remotely a lot easier.
Change-Id: I23434af5e88fb8dcdb154be34f12276eba652d4f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Jason Barron [Tue, 4 Sep 2012 08:47:04 +0000 (10:47 +0200)]
WMF Backend: Fix crash in MFPlayerService::releaseControl.
When releasing a video render control or a video window control, we
were deleting the object pointed to by the 'control' pointer, but
were not setting this pointer to 0 which left it dangling. Shortly
after we tried to cast this dangling pointer to another type which
crashed. The solution is just to return after deleting the control.
Change-Id: I9ab672c8b86a13af889d87c76141e6b8db5b74a7
Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
Tasuku Suzuki [Thu, 30 Aug 2012 15:51:20 +0000 (00:51 +0900)]
Make compile with -no-widgets
Change-Id: I6a057950315a1e2084fd6fc130007f865d096f12
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Thiago Macieira [Wed, 29 Aug 2012 19:40:03 +0000 (21:40 +0200)]
Update the git-archive export options
The .gitattributes and .gitignore files do not need to be present in
packaged sources, as they are for people using the Git repository.
People who download tarballs usually don't reimport into Git -- they
should just download the actual repositories.
Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the $n string, ask git-archive to store
the SHA-1 of the commit being packaged.
Change-Id: I7f56327b21264dfd32d5d2519ca49aa1453083d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Tasuku Suzuki [Sat, 1 Sep 2012 06:50:49 +0000 (15:50 +0900)]
remove useless dependency in qmlvideofx.pro
Change-Id: Ie79cc9294f3845c089525195684df4a60171f78c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Venugopal Shivashankar [Thu, 2 Aug 2012 09:17:05 +0000 (11:17 +0200)]
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>
Dmytro Poplavskiy [Thu, 16 Aug 2012 04:45:46 +0000 (14:45 +1000)]
Camera integration test fixes
Skip the testCtorWithDevice test if camera doesn't
support devices selection;
Allow synchronous camera status changes
Change-Id: I14f4a74f8a92b8dc2f75f8f5df2bcf9c124bda68
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Dmytro Poplavskiy [Fri, 17 Aug 2012 03:44:14 +0000 (13:44 +1000)]
Initial implementation of Mac camera backend
Based on AVFoundation framework
Change-Id: If4cfd105a592f50b42606624548b9ffc870e3e47
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Dmytro Poplavskiy [Thu, 23 Aug 2012 05:59:18 +0000 (15:59 +1000)]
Re-enabled CIImage based gfx video item on Mac
Also prefer CoreImageHandle to GLTextureHandle
in QuickTime player backend, to avoid unnecessary
copy via FBO.
Change-Id: Id5aa039c438378b7bbf816b7845b05574683c471
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Stephen Kelly [Mon, 13 Aug 2012 08:56:18 +0000 (10:56 +0200)]
Use Qt::WindowFlags, not Qt::WFlags.
The latter seems to date from the Qt 1 days, and such abbreviations
are not current Qt style.
Change-Id: I576a04e60c59e0bdf60da9c07e4d2917fc02a491
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Oswald Buddenhagen [Tue, 7 Aug 2012 17:35:19 +0000 (19:35 +0200)]
make use of QT_PRIVATE to specify private Qt dependencies
Change-Id: I339de1ebc3cde795a3b4a258f3899bd5658a1f54
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Oswald Buddenhagen [Tue, 7 Aug 2012 17:11:07 +0000 (19:11 +0200)]
follow rename of qt_module_config.prf to qt_module.prf
Change-Id: I6fd02095b9c75952c689b2c55aec9c71b39aadd3
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Lars Knoll [Mon, 6 Aug 2012 18:46:55 +0000 (20:46 +0200)]
Remove the WA_PaintOnScreen widget attribute for vide widgets
This attribute doesn't quite do what it used to do in
Qt 4.x anymore, and will lead to Qt not painting the video
at all.
Change-Id: I2338815756cab82ae152058ff5a7b5f14e07001e
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Kurt Korbatits [Mon, 6 Aug 2012 00:46:52 +0000 (10:46 +1000)]
Added skips to reported bugs in qmediaplayerbackend test
- Changed some checks to QTRY's to avoid using qWait's
Change-Id: Ib7fb6fd25170c40969389c9c1b16f4a4e0e7a5e7
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Oswald Buddenhagen [Thu, 2 Aug 2012 20:10:01 +0000 (22:10 +0200)]
qt_module is deprecated, use qt_build_config
Change-Id: Idbc3c1d35b859317ac1128c4dc3754996e816911
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Thiago Macieira [Wed, 1 Aug 2012 14:19:36 +0000 (16:19 +0200)]
Compile in C++11 mode: the Q_DECLARE_METATYPE must be visible
The error was:
tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp:113:62: required from here
qmetatype.h:637:5: error: static assertion failed: Type is not registered, please use Q_DECLARE_METATYPE macro to make it know to Qt's meta-object system
Change-Id: Id4e29803de646cbad0d401b1fe0e0b38e458d12f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Lev Zelenskiy [Tue, 31 Jul 2012 07:20:09 +0000 (17:20 +1000)]
Change the way camera format is selected.
Build list of supported formats before starting directshow graph.
Select first available format supported by both device and surface.
Force DirectShow to do color space conversion instead of using QImage.
Change-Id: I8f946cc7c2693eea0135981e899003b453bd8784
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Michael Goddard [Mon, 9 Jul 2012 06:51:50 +0000 (16:51 +1000)]
Add 32 bit support (int/float) support to audioinput example.
Change-Id: Ib7160f60af36cdccfe91a620f5555189792c13c4
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Michael Goddard [Mon, 9 Jul 2012 06:51:16 +0000 (16:51 +1000)]
Fix some failing QAudioInput integration tests on OSX.
This also meant implementing software volume support, and since
this is the last backend to do so, make that interface pure
virtual again.
In some cases the test needed tweaks.
Change-Id: Ie429863f187b43802cdd4f16d841929e0cb0e729
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Lev Zelenskiy [Fri, 27 Jul 2012 01:35:17 +0000 (11:35 +1000)]
Use moniker display name for device string.
Moniker names are unique, while device friendly names are not.
Change-Id: Ic3e842e49d04c502cf5ad1fc40f89db657f0401a
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Kurt Korbatits [Tue, 31 Jul 2012 00:26:28 +0000 (10:26 +1000)]
Added check to qsound and qsoundeffect unit tests for audio support
- skip tests if QSoundEffect::supportedMimeTypes() returns empty list
Change-Id: I0f8d6f854c46b74f8518c4d969bd31ea167d20b2
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Corentin Jabot [Sat, 28 Jul 2012 12:31:11 +0000 (14:31 +0200)]
The qt quick imports are build only if qtdeclarative is present
If the declarative module is not present, the qtquick/qml plugins
in the imports directory will not be build
Change-Id: I2393b8302f75cbb94d3a85bd70f575817a0a3c34
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 14:06:18 +0000 (16:06 +0200)]
Add a missing include for Q_MULTIMEDIA_EXPORT
The macro is gone from qglobal.h.
Change-Id: I41c66f61f47ec9e824c3637c7748796df2309d66
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 14:08:24 +0000 (16:08 +0200)]
Use QStandardPaths instead of QDesktopServices
The use of QDesktopServices for getting paths is deprecated in favour
of QStandardPaths.
Change-Id: I93c4a15dd65962d668c90e78f3f33f357e2450bb
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 14:17:37 +0000 (16:17 +0200)]
QRegion::subtract is deprecated
This code was suspicious. It looks like it was broken, caught by the
gotcha that the old API was.
Change-Id: Ief9543de3b9fdf18f6b620c9462a75594a4a3903
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Thiago Macieira [Wed, 1 Aug 2012 14:35:23 +0000 (16:35 +0200)]
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>
Thiago Macieira [Wed, 1 Aug 2012 14:33:03 +0000 (16:33 +0200)]
QAbstractItemMode::reset() is deprecated, don't use it
Instead, use beginResetModel() before the model is reset, and add
endResetModel() after it.
Change-Id: Ibac3f2207ed999ed9d703266509b3ad91203f28d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Thomas McGuire [Mon, 30 Jul 2012 13:27:18 +0000 (15:27 +0200)]
Blackberry: Assert that we are in detached state
Change-Id: I744d542374c72318b548407cd3da084449822e92
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Thomas McGuire [Fri, 27 Jul 2012 11:19:11 +0000 (13:19 +0200)]
Blackberry: Fix spurious position udpates in playlists
Change-Id: I2652cab793034e55a4eb7e52bb534c22983d9517
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Thomas McGuire [Fri, 27 Jul 2012 09:02:29 +0000 (11:02 +0200)]
Blackberry: Fix playlists not advancing to the next track.
The playlist watches for state changes to the EndOfMedia state, which
wasn't used in the plugin yet.
Change-Id: Ib2a014177df2273cd46baaef1392a73e54daf06c
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Lev Zelenskiy <lev.zelenskiy@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Thomas McGuire [Thu, 26 Jul 2012 14:06:17 +0000 (16:06 +0200)]
Blackberry: Fix playback from certain URLs
Previously, playback from URLs of the form "file:path/to/file" did not
work.
Change-Id: Iecd293d09f7c448438dbf259710c0aab218c2591
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Lev Zelenskiy [Mon, 30 Jul 2012 02:08:00 +0000 (12:08 +1000)]
Fixed: use selected audio input device.
Change-Id: I6bde75bff93160169f9c28ad658db40b03c266f4
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Lev Zelenskiy [Mon, 30 Jul 2012 03:06:47 +0000 (13:06 +1000)]
Audio probes for AudioCapture plugin.
Change-Id: Iea37d455ee53c9d055af4f9ca62d8a9ea241d31f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Michael Goddard [Fri, 27 Jul 2012 04:41:52 +0000 (14:41 +1000)]
Fix a few header style violations.
Missing Q_MODULE or using moc keywords.
Change-Id: I3cb21799488c6f57c45d8e32862a49fadd083b99
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Thomas McGuire [Thu, 26 Jul 2012 14:02:57 +0000 (16:02 +0200)]
Blackberry: Fix case of setting multiple media files
Abort the singleshot timer when the media is changed, as otherwise
continueLoadMedia() was called multiple times.
Also, don't use a singleshot timer when setting a null media.
Change-Id: I19d4838c9c70e7fcaa790c223cb19ac3e0246e6b
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Thomas McGuire [Fri, 27 Jul 2012 09:37:31 +0000 (11:37 +0200)]
Blackberry: Fix metadata reader for more recent OS versions
Change-Id: I33dae07736eb071f9db3e08c5342921a655ddd57
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Jerome Pasion [Fri, 27 Jul 2012 12:51:00 +0000 (14:51 +0200)]
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>
Kurt Korbatits [Wed, 18 Jul 2012 05:39:20 +0000 (15:39 +1000)]
Replace QSoundEffect backend using qmedia with qaudiooutput implementation
- Use backend built on QAudioOutput
- Fixed unit test so backend will pass
Change-Id: I2f2a7d8bf382127c5a5c333d6e36c79169754b4e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Venugopal Shivashankar [Wed, 25 Jul 2012 13:17:28 +0000 (15:17 +0200)]
Fixed QDoc errors related to snippets and quotefromfile commands
Change-Id: I9dd6381eb95dcbd9aa5cc8f596d87cf55eee7427
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Mylione Anadarajah [Tue, 17 Jul 2012 09:15:13 +0000 (19:15 +1000)]
Added data driven integration tests for qaudioinput.
Change-Id: I42256833173e9ca94931ff35210802457d407e39
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Lev Zelenskiy [Wed, 25 Jul 2012 03:23:57 +0000 (13:23 +1000)]
Volume control for QAudioInput windows backend.
Change-Id: I1245a38c68254fc48373a856dc44e8ad8142636e
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Kurt Korbatits [Wed, 25 Jul 2012 02:28:23 +0000 (12:28 +1000)]
Added check to alsa backend for QAudioOutput
- Was asserting when stop() called when in IdleState
Change-Id: Ib8a5bd149c0b9c700c709520cf8ffdd237e08694
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Kurt Korbatits [Wed, 25 Jul 2012 21:46:46 +0000 (07:46 +1000)]
Fix compile failure in qmediaplayer unit test
Change-Id: Ic8342f536b16c55c79e4ff792634d5d1a03e3a9a
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Venugopal Shivashankar [Thu, 19 Jul 2012 13:44:36 +0000 (15:44 +0200)]
Moved doc under src to fall in-line with the new modular structure
Change-Id: Ia2933baa1f0eaf82b5c2a626cb3661ee087049e3
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Venugopal Shivashankar [Fri, 20 Jul 2012 09:47:11 +0000 (11:47 +0200)]
Moved the C++ module page from qtdoc
Change-Id: Ib4b3dbe48053532abc31d294f328d21e01047bb5
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Friedemann Kleint [Tue, 24 Jul 2012 12:53:25 +0000 (14:53 +0200)]
QtMultiMedia/Tests: Fix MSVC2012 warning about overload.
warning C4373: 'MockVideoSurface::supportedPixelFormats': virtual function
overrides 'QAbstractVideoSurface::supportedPixelFormats', previous versions
of the compiler did not override when parameters only differed by
const/volatile qualifiers.
Change-Id: I87701ce0a2db3d4a0ec0a98980ad231f352a2ab2
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Lukas Geyer [Tue, 24 Jul 2012 11:12:45 +0000 (13:12 +0200)]
Fix compilation issue with MinGW (disables the usage of strsafe.h).
Recent versions of MinGW include strsafe.h in dshow.h.
strsafe.h undefines all non-safe string functions, including
vsprintf and others, to prevent their usage. This causes
QString and others to fail. Defining NO_DSHOW_STRSAFE before
including dshow.h prevents this behaviour.
Change-Id: I012fecbabc5c11900486c1dfdc970a00613ef6f7
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Friedemann Kleint [Tue, 24 Jul 2012 13:08:50 +0000 (15:08 +0200)]
QtMultimedia: Remove usages of qWaitForWindowShown(QWidget *).
Change-Id: I7a2869c381da133b72b1721838a458cdbf058b0d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Stephen Kelly [Mon, 23 Jul 2012 07:34:14 +0000 (09:34 +0200)]
Mark QtMultimediaQuickTools library as internal.
It does not install useful public headers (and those that it does
install are installed to QtMultimediaQuick_p).
This causes the avoidance of creation of CMake files.
Change-Id: I7360f9c8e4b203ce0573c1cbfcc87d326e8f0d2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Stephen Kelly [Mon, 23 Jul 2012 07:58:26 +0000 (09:58 +0200)]
Add the CMake directory created during unit testing to .gitignore.
Change-Id: I98a8c1a1231c558b75fd02419237546face4dfcf
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>