Doc: Adding Qt Multimedia Widgets documentation.

-added landing page and module page
-linked to Qt Multimedia and Qt Widgets
-excluded multimediawidgets dir from the Qt Multimedia documentation

Task-number: QTBUG-29339
Change-Id: Iaa8dc4117505d5635b8cab97ed5c10e9c4a289e6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>

BlackBerry/QNX: Add a new backend for Blackberry handling audio

For now it only implements the audio output part.
The plugin can be used on all QNX systems (including BB10) that
provide a libasound version < 1.0.10.

Change-Id: Ifcfd871558d5d2bfb9e8a5f5ef0cfe009c0a111d
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

Blackberry: Implement QVideoRendererControl for QMediaPlayer backend

If the application is not supposed to play back DRM secured media,
we grab the pixel data from the native mmrenderer window now
and make them available to the QAbstractVideoSurface of the
QVideoRendererControl. This allows the usage of all transformations
on video output inside QtQuick.

Change-Id: I73d05404b1ac9c5f74a234d9393b981a6fbcb317
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

Blackberry: Grab viewfinder frames from native window

Since the conversion from NV12 to RGB on the CPU does not scale
for larger photo/video resolutions, this patch uses a different
approach. It uses the low-level screen API to grab screenshots
of the native viewfinder window and provides them as QImage to
the QAbstractVideoSurface. Even for large resolutions this
is quite performant.

Change-Id: I59a7cbe6850b3b07575ea10026f3180cfd22e935
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

add error handling in image capturing in camera

Task-number: QTBUG-28589
Change-Id: Ib3a04038c16beba66f8b8cff85b310dad9a4460a
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

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

Blackberry: Add support for reading meta data in QMediaPlayer

Provide an implementation of QMetaDataReaderControl for the
QMediaPlayer.

Change-Id: I58c04e40ae3f07013450997410d0a379273c7bde
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

Blackberry: Extend platform-specific documentation

Reflect camera support in Blackberry-specific documentation page.

Change-Id: I5267a32b99aa88cd73f33fe045d67579442f9932
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

Blackberry: Fix resolution selection for video recording

Fix the selection of the video viewfinder resolution depending
on the features provided by the camera. If the viewfinder is responsible
for encoding the video frames, the resolution of the viewfinder
and the video output must match. Otherwise only the ratio must match
and we can use a lower resolution for the viewfinder to improve
the performance of the NV12->RGB frame conversion.

Change-Id: I66ace84841a69be84f83bf9c5240cd23d96fbb76
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

WMF: removed unnecessary dynamic_cast.

Task-number: QTBUG-29722

Change-Id: Ia0e5c8fb90b231a8d9764524709d5848397c2afb
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

Doc: Fix faulty snippet in Video Overview page

This change modifies setVideoSurface() in the snippet code
to be a bit more robust.

Task-number: QTBUG-29383

Change-Id: I2c691f19fe8f0912c1287597045da3a5579d2108
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

Loop video infinetely on qmlvideofx.

Change-Id: I40e444e75f0fd08860920b78b5b5ff190bce9ae9
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

User cannot press cancel after folder up.

Moved cancel button on top of folder list views. Selected
file is not anymore emitted on cancel.

Change-Id: Ia7b666b4519fe03ca36c41d1694d2ad3ff4ace51
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

User is not able to select file from FileBrowser and play it.

When string is converted to Url qrc:// scheme is used.
Fix Filebrowser to use file:// scheme instead.

Change-Id: I713e704eb52d27d046ace1ff7d65feb98635461d
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

Video has ended UI say tap to stop.

Loop video infinetely so tap to stop & start state is correct.

Change-Id: I56af6eb00fcc7811cc25099df3c7fa47f429a3e6
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

User cannot press cancel after folder up.

Moved cancel button on top of folder list views. Selected
file is not anymore emitted on cancel.

Change-Id: I37884e142e774fb03d1a39e4b30e71a4e9f1001f
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

Fix qrc references on qmlvideo example.

Change-Id: I0722e720dbc017186cefd0e45dd5a11023906b56
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

User is not able to select file from FileBrowser and play it.

When string is converted to Url qrc:// scheme is used.
Fix Filebrowser to use file:// scheme instead.

Change-Id: I9617d9503ed403de7d017b8586ae37b05dc096cb
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

Remove QEXPECT_FAIL on Linux for QPainterVideoSurface::shaderPresent

These tests seem to be passing consistently now, so this is an attempt
to reenable them on Linux, as right now passing them on some Linux
machines in CI is causing failures.

Task-number: QTBUG-26320
Change-Id: I4f2b219dc694e24d8beee651919f3b805922bde1
Reviewed-by: Tobias Koenig
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

Fix XPASS on Ubuntu Precise Pangolin.

Change-Id: I0199ad3a52621763c214fa65302d3de4701814cf
Reviewed-by: Tobias Koenig
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

Fix MinGW-warnings about mismatched types.

Change-Id: I6170e3aa49f5b60ba68c1ef5bb2c6c7ec6688060
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

DSVideoWidgetControl: Fix constructor order.

Change-Id: I804427867a0f400750ef1df423c89fb4948bb0a3
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

Fix warnings about unused variables.

Change-Id: I147ff8624faa98396d6c48801c41a731fd02ac10
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

Fix MinGW64-warnings about unknown pragmas.

Change-Id: I1bd2178f5986846aede371193e98b55e4bde6414
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

DSVideoWidgetSurface: Pass on parent to base class.

Change-Id: If4f2819a0767234e5fffeafe1ab038cbf13bdd2a
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

Reduce MinGW64-warnings about mixerID.

warning: cast to pointer from integer of ifferent size.

Change-Id: I4294fe7b67c56d1eca59f81c3af26919ad5089a8
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

Fix signature of the waveInProc/waveOutProc callbacks.

Parameters are DWORD_PTR instead of DWORD, which did not matter
on 32bit but caused MinGW64-compiler warnings and potential
crashes on 64bit.

Change-Id: I840ae3ea7ea532746f73f20b3233cae842931d45
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

Remove QPointerBase bic check.

QPointerBase is not public or exported and it is to be removed

Change-Id: Ifd43a34125af1116b130321df6256b2a7a9b05a2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

Fixed a connection to a slot that doesn't exists

Change-Id: I7f94bab4e230996ace46d1c04d9d5a66ad9443d5
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

BlackBerry: Fixed playback of streamed audio

Before audio is played we always seek to position 0. Unfortunately, due
to a recent change in mmrenderer, playback stopped working for
"non-seekable" media. There is a check now, whether the media is
seekable or not.

Change-Id: Ieafd8d1364f7ce0194f4fa17d3efe894aa1b289b
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

Blackberry: Fix orientation of taken photos

Ensure that the taken photos are always upright.
As long as the QCamera API does not provide information about
the native orientation of the camera, we have to do the rotation
inside the BBCamera plugin.

Change-Id: Iebb04a5417274c2baee5e944dadf10fc706484d9
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>

Blackberry: Restart camera viewfinder after standby

Listen to the CAMERA_STATUS_POWERUP signal, which is sent
after standby, and trigger a restart of the viewfinder
in this case.

Change-Id: I426f23657844bb270ddfd0e4bfb35880040aa583
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

Blackberry: Ensure that camera viewfinder texture is upright

Make sure that the texture is upright when the device is upright.
When rotating the device, it's the applications responsibility to
rotate the texture of the viewfinder (e.g. through the
QDeclarativeVideoOutput::orientation property).

Change-Id: I6e453ce9bdde5197104533f844b1079b3c3db908
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

Blackberry: Add camera support for BB10 platform

Reimplement all camera related controls as they are supported by the
BB10 camera API.

Change-Id: Ie7d2258be22c1c1821489bd7074b80cff4242afa
Reviewed-by: Bernd Weimer <bweimer@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

Fix lupdate-Warning in qcamera.cpp.

qcamera.cpp:183: Cannot invoke tr() like this

Change-Id: Ia8f29c02bbc4b91c6542d9ed44136094e1e8a2e1
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>

fix doc page urls

they are versioned nowadays

Change-Id: I5c2ca367b8e63523811c03595cf8a7e326e8a662
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

substitute fixed version numbers in qdocconf files with variables

Change-Id: I20bd702b481d82903f5f4a42e74a8fb8ad4e71dc
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Add a simple accessor to the video provider snippet

Task-number: QTBUG-29383

Change-Id: I744fb997dae6ad1f9b8075791ad463c8fe23a96d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>

Blackberry: Fix warning about unsigned integer comparison

Change-Id: I00592dd078e85497589156e156e7a665f935d325
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

Merge "Merge branch 'release' into stable" into refs/staging/stable

tst_bic: Replace test data for linux-gcc-ia32

The ia32 bic data was re-generated due to a BIC introduced
by a45d35c07f9eed27fc286ab5fbc00789d45259b5

While we are at it, add a new set of data for amd64.

Change-Id: Id210b57f68229aaca09c0cd81bd371392d2bcc74
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

Blackberry: Refactor plugin directory structure

Move the mediaplayer related code in its own subdirectory.
This is a preparation for adding camera support in the future.

Change-Id: I880ff90e154165c2a3a31fd2b51e1dd224fea8fd
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>

Merge branch 'release' into stable

Change-Id: If07e76a0f2f46d6dc50a41441324f02393e17d01

Add a changelog for the BC break

Change-Id: I768fcbbc871207e99466a2e1a9c7a67d98a2c897
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Doc: Fix module name format

Follow the conventions at
http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation

QtMultimedia -> Qt Multimedia

(Also, QtMultimediaKit has been merged into Qt Multimedia in Qt 5)

Change-Id: I3c23435d5eceb946ea320756b835da937726db24
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

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>

Doc: Add QML Types to table of contents in Assistant

Replace 'headerfile' with 'qmlclass' in qdocconf file.

As a positive side-effect, QDoc will also add files for
'All members' for QML Types into .qhp as well.

Task-number: QTBUG-29226
Change-Id: I892f386cbd22bfbf7a04be5aecc800896e1090ec
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>

Doc: corrected reference to snippet in qsoundeffect.cpp

Task-number: QTBUG-29101
Change-Id: Ie8cfd257736b0329d9aa5d1f5270c85651d335ec
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Add virtual destructors to two classes with other virtuals

Classes with virtuals are used polymorphically (why have virtuals
otherwise?), so they need virtual destructors to be deleted
properly. Unless they are never deleted using objects of those two
classes -- but why have the interface in the first place if that's the
case?

This is binary incompatible change. It was agreed upon in the mailing
list.

Change-Id: I697e4bd53251452a0e6b0c09edd08c4835f90cbd
Discussed-on: http://lists.qt-project.org/pipermail/development/2012-December/008908.html
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

QAudioInput/Output documentation: Fix slot naming in snippets

Having a code snippet use a slot (stateChanged) with a name
identical to a signal in QAudioInput / QAudioOutput classes causes
problems (incorrect links) in class documentation that refer to
the snippet code.

This change renames the slots according to standard Qt convention.
Same change is applied to example applications as well.

Task-number: QTBUG-26688
Change-Id: I0c6181240237d0c642b73fe18f3ddb5137b7f207
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Doc: Summarized documentation fixes in changelog file.

Change-Id: I1713bb96c043195af0dadb91b294b6a64db60ad4
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

WMF: enabled HW-accelerated video decoding for the QML video item.

It also applies to QGraphicsVideoItem when used on a GL viewport.
We now have a new video sink that is based on Microsoft's EVR sink, we just
replace the default Presenter with our own. Frames are rendered into D3D
surfaces using DXVA, then copied into a shared D3D/EGL surface and finally
bound to a GL texture to be used by the video surface.
The shared D3D/EGL surface is a feature provided by ANGLE and therefore Qt
must be compiled with ANGLE for this new video sink to be compiled and
used.

Change-Id: I0b7b9968eed5488f9ef1a2dcca5213bd0af232ab
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

WMF: fixed unresolved topologies when using the custom MediaSink.

When using our custom MediaSink with RGB formats, Media Foundation fails
sometimes to resolve the topology. Inserting ourselves a ColorConverter
transform in the topology resolves the problem.

The ColorConverter transform cannot handle dynamic frame size changes
(this can happen with H264 videos for example) so we also need to insert a
Resizer transform to handle transparently frame size changes.

Change-Id: Id7f37a0af65f142fbe6d420ad7b2c1ac2156c21b
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

WMF: fixed scrubbing and changing rate to 0 or negative values.

Task-number: QTBUG-29147
Change-Id: I3e32e520d676d120d60bcd07d122006c1346eb0d
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

Doc: Fixed "QML Types" listing C++ classes.

Removed "class" from the "selectors" qdocconf variable

Task-number: QTBUG-29242
Change-Id: I1d6c264a6a4277dff27bffcd39d9841363241f7d
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>

Doc: Fixed random QDoc warnings

- Fixed \snippet paths
- Minor language edits
- Removed unnecessary multiple page commands in a single comment
block. For example, \fn and \qmlsignal in a single comment block
is not allowed. Such instances must be documented in separate
comment blocks.

Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
(cherry picked from commit 51334d299520118bbbc077696ca589f972a2f2ea)

Make sure QVideoSurfaceGLPainter always uses a valid texture.

QVideoSurfaceGLPainter should not assume that the GL texture provided
by the QVideoFrame is fully initialized for drawing.

Change-Id: I752ecf69a3cf1faf0a7cf8f84b372c3b347824be
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Fixed QSGVideoNodes not deleting their materials.

Change-Id: Ia7597ade3066c23c54354e2cc36c907e6bf0dfea
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

Bump Qt version to 5.1.0

Change-Id: I68f5c34fe14860c40537a23f28e741f0ac1eef1e
Reviewed-by: David Faure (KDE) <faure@kde.org>

tst_bic: Add linux-gcc-ia32 bic data for QtMultimediaWidgets

Change-Id: I070b233b3358abd16bda8e83c139b7ad61b6fdd0
Reviewed-by: Caroline Chao <caroline.chao@digia.com>

Doc: Fixed random QDoc warnings

- Fixed \snippet paths
- Minor language edits
- Removed unnecessary multiple page commands in a single comment
block. For example, \fn and \qmlsignal in a single comment block
is not allowed. Such instances must be documented in separate
comment blocks.

Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Added seek() function to QML Video item and updated documentation.

The Video item inline example was wrong, changing read-only properties.

Task-number: QTBUG-28741

Change-Id: Ia1f6c1110a301a96743e7ebfec51731fcaf6a862
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>

Fix: Bug fix in determination of scanline direction

YUV and other compressed frame formats are always TopToBottom. Only for uncompressed RGB formats the sign of their height is used to indicate the scanline direction.

Change-Id: I6474783583672861eeeb538b79d14ee3d6995f59
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>

Fix: Only flip video once for BottomToTop scanline directions

Top & bottom of the texture coordinates are already flipped for BottomToTop scanline directions.
So there is no need to flip top & bottom of the vertex coordinates too.

Change-Id: I221b94afb65c194bdedb787414e6a436b8095fb2
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@gmail.com>

doc: Fix namespace version to 5.0.1 for qhp documentation

Change-Id: Ie2d0aeff6d8b63ae9d18896320557d28cc9adb68
Reviewed-by: hjk <qthjk@ovi.com>

make use of qtHaveModule()

Change-Id: I14da5455b7dd4681254e1652395df5f5c65746bd
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

tst_bic: Add test data for linux-gcc-ia32

Task-number: QTQAINFRA-321
Change-Id: I51cabb707107ae6cc788ff04b0886dc3d06b3693
Reviewed-by: Caroline Chao <caroline.chao@digia.com>

Update changes file for 5.0.1 release

Change-Id: I1d5fbb280146042da3894ecfdb544e0cbffb3368
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Oleg Shparber <trollixx@gmail.com>

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>

Merge branch 'stable' into release

Change-Id: Ifa5ddfd7ee4a637f78947fc1cb945d3008506973

WMF: added more metadata keys (on Windows 7 and later).

Change-Id: I01eebd0582d33eb3d581176bba2a84fa75db2463
Reviewed-by: Jason Barron <jason@cutehacks.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>

Compile in 32-bit mode.

CGRect == NSRect only in 64-bit mode.

Don't add -framework QuickTime based on the host arch,
use QT_ARCH instead.

Change-Id: I829bc1bcfe37f70a07e8c55a5bc7dee90aaa981a
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

remove leftover code from multimediawidgets carve-out

Change-Id: Ibb347193761a94ce4a309eddb75af37b73dd9be6
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>

WMF: release video controls before releasing the session

For the VideoRendererControl, also stop the video surface at the same
time.
This fixes a crash when changing video.

Change-Id: I49484f8b277c345dafb3e5947cf5d23df15546f3
Reviewed-by: Jason Barron <jason@cutehacks.com>

WMF: Fixed uninitialized member variable.

Change-Id: Iee60d6eee7bbf9dd7804216f4a49c4549f41ba5a
Reviewed-by: Jason Barron <jason@cutehacks.com>

WMF: re-enabled video probes and made it more robust.

Fixed the way the custom MF Transform (getting the frames) works:
- Recreate it whenever we load a new media
- During media type negotiation between nodes, the MFT should support
  the same types as the video sink supports
- Allow input and output types to be changed as many times as needed,
  otherwise the topology cannot be resolved in some cases

Change-Id: I7ca77e1a3dee83643f1a97f2e6ada9c5c0e88309
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Make QtMultimedia an identified module

Task-number: QTBUG-28376

Change-Id: I7b27dc52b3085eb50695e559029f2533aa743d4f
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
sync.profile

Change-Id: I450b86e3d01498aca12fe11a28527a296f2cbc3f

Add changes-5.0.1 file

Task-number: QTBUG-26065
Change-Id: If025c8cc5be1304b30e3cbc983d0a1de31224a1b
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Doc: Moved the qdocinc and image to the sourcedirs

QDoc parses the \input command relative to the sourcedirs
and not exampledirs. So I had to move the qdocinc file and
the corresponding image to the sourcedirs.

Task-number: QTBUG-28727
Change-Id: Ie064f0b79ab8ffcb0587b43ff4508f5865a321a9
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

Remove comma at the end of the enum

Required for public header cleanliness

Change-Id: I2641fd085071b2a69806e8622c7c35be74f744b1
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>

Bump Qt version to 5.0.1

Change-Id: Ic45b749ceea86263281b5c23509bf301fa334e5f
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>

fix include statements

Names are case sensitive when cross bulding for mingw on unix.

Change-Id: I355b9388241c7c5fefb05b6f0c231efec4530c7e
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>

Use qrc to deploy qml files in declarative-camera examples

Make the declarative-camera example working in shadow builds by including
the Qt Quick assets via a .qrc file.

Change-Id: Iea56e7d69558503abdf15a600a6ce21ea90ee99a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

WMF: Fixed incorrect QMediaPlayer volume reporting.

Task-number: QTBUG-26621
Change-Id: Id70a68ad61fd7d68f4ee277f33a54bd9c00c05d0
Reviewed-by: Jason Barron <jason@cutehacks.com>

Polish and fix qmlvideofx example

Change-Id: I30f6d7d2af784ba018a659a16aceb4876a4b1be6
Reviewed-by: hjk <qthjk@ovi.com>

Add qmake generated files to .gitignore.

Add source files generated by qmake for automatic static plugin
imports to .gitignore.

Change-Id: I38977c5d410e1dc9f424de39c88a9fcd281d1e69
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Example: Notify user of errors

Before, the widget simply failed silently, which gave the impression
that the widget is broken.

Change-Id: I8ab7ed0e0a62f9643791b6f4732f7f3b2cd7521a
Reviewed-by: Martin Smith <martin.smith@digia.com>

point dependencies to 'release' branches

Change-Id: Iabbadc65f1cd3cd8c43f10971b0b5213e459c268
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

Examples: Remove qmlapplicationviewer template.

Fix shadow-builds for qmlviewer examples by using qrc files instead.

Task-number: QTBUG-28614
Change-Id: Iec993f95166ffd09e8edff552ceca5bc4112d293
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>

remove QT+=widgets from SUBDIRS projects

it makes no sense whatsoever

Change-Id: I114799dbe35ac31f6d90642ba8c5dbe3fc075604
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

remove obsolete DEPENDPATH assignments

qmake now add CONFIG+=depend_includepath by default, making manual
DEPENDPATH setup unnecessary.

Change-Id: Iffd78b4c7cf8d048a822b75c481ac380b3d8d0f4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

remove some unnecessary CONFIG additions

qt is already added by spec_pre.prf, warn_on by default_pre.prf, and
no_private_qt_headers_warning by qt_build_config.prf.

Change-Id: Ia5cee420d577dd0ae0120cb2dd430d4ddd29ebcf
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

sync.profile: Point dependencies to 'refs/heads/dev'

We should test dev branches against dev branches only by default.
At some point we should automate the merges from release->stable->dev
and/or decide how to handle possible conflicts.

This is good enough for the time being.

Change-Id: I9f3c9977b162b82611e48cd304cfcc316fed95ad
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>

Doc: Fixed broken links to the Multimedia examples

- Updated the example links to reflect the new directory
structure for the multimedia examples.
- Removed a broken link to audiodecoder example
as it doesn't have a qdoc page yet.

Change-Id: Ia1169eeb80b4e6b6f92cd070aecbe72ce696bb6a
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

Doc: Updated the \example and \snippet paths

Also:
- Grouped the example docs under one group. i.e. multimedia-examples
- Moved the \group page here from the qtdoc repo
- Moved the snippets directory under doc from doc/src

Change-Id: I28fb81cf910e58101cd601fb4c440b59b0b0366d
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

test: Mark tst_QPainterVideoSurface as insignificant on Windows

Task-number: QTBUG-28542
Change-Id: Ib879ffd31e534cc9cde4c4893af6f2a7799529cd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

test: Mark tst_QDeclarativeVideoOutputWindow as insignificant on Windows

Task-number: QTBUG-28541
Change-Id: I5d59a1daf5494aca28a573e312bbf1bf8e7d95e2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

WMF: Fixed crash when cancelling media loading.

Since media loading is asynchronous, cancelling could cause a crash when
done after the media is loaded but the callback hasn't been called yet.

Change-Id: I9c9b7bfaa495b9e75765111c15afb07e8b699488
Reviewed-by: Andy Nichols <andy.nichols@digia.com>

WMF: Improved error reporting.

When loading the source fails because the file format is not supported, we
now report a FormatError instead of a ResourceError.
When the file format is supported but the media cannot be played (topology
cannot be resolved), it is most likely caused by a missing codec and we
then report a FormatError.

Change-Id: I101a86c129a0c5dccb543fc1247cb741994684fd
Reviewed-by: Andy Nichols <andy.nichols@digia.com>