This means that we are going to use the same branch name for the
dependencies as the branch of the repository under test.
If we are testing the 'stable' branch, all dependencies will point
to the 'stable' branch as well.
Change-Id: I8f899a9a9fb9e94b99a9250eb5eb2dbe2eed8fc5
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
libQt5MultimediaQuick_p is first loaded as a result of a qml import, and
is therefore not detected as a dependency.
Note that libQt5MultimediaQuick_p will only be added as a dependency if
QtQuick is used.
Task-number: QTBUG-30861
Change-Id: I8ce818ef1648302bbbbdf63ef133185a66b66cca
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
No longer include <qedit.h> in directshow-plugin,
which no longer ships in newer SDKs.
Ensure it only provides the camera service if the
WMF-plugin is built by using a different .json-file.
Adapt qcamerabackend-test to use widgets.
Task-number: QTBUG-28047
Change-Id: I22ea441b9edb56ff55bc275dba37c01c77d8dd90
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
qmultimedia.h is included in more places, but qmediametadata.h is
larger. This patch should reduce unnecessary #include-ing.
Change-Id: I4a3d174bafc555d794bb75087c1f6b79745ae903
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This usage of PerformanceMonitor needs to be protected by the same
preprocessor check as the header include that makes it available.
Change-Id: Ie8a1b6e99a61c333ceedcf2e9751235fc2efb415
Reviewed-by: Martin Smith <martin.smith@digia.com>
QDoc needs to know the directory under which the examples are
installed in QT_INSTALL_EXAMPLES. Without them, example manifest files
may contain invalid paths.
Change-Id: I3d27517e41e3b1deb7643ca1a40f3905c0e5cc1a
Reviewed-by: Martin Smith <martin.smith@digia.com>
We need to adapt to the way the jar builds are split on Android,
into a jar file which can be bundled and one which can be distributed
and loaded on the classpath.
We also need to add meta-information about which plugins the
module depends on so that they can be bundled as well.
Task-number: QTBUG-30751
Change-Id: I5cca51c3732ce72985df29672a219c3fd4fe7bac
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
qdocconf files for both Qt Multimedia and Qt Multimedia Widgets already
define the correct example path. This change fixes also the example
documentation to use the correct path, as well as the link to examples
in Multimedia Overview.
Change-Id: I72d75027ee18f6398eb76dc40bcc3d122541b1c9
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
The Android multimedia plug-in requires API level 11 to compile, so the
config test will check and issue a message about the requirement if the
API level can't be satisfied.
Change-Id: I6c21fe1255024e853023bd8168dfa917b00c4c23
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-changed title of "Qt Multimedia Overview" to "Multimedia". It follows
the other topic titles from qtdoc.
-fixed column widths of paragraphs
Change-Id: I8a12d1d9a2a9c3ca184d69ebe464c80721a117f7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
This change fixes QCH documentation title for Qt Multimedia Widgets.
Also, the project names are changed to use CamelCase - this is required
as qdoc will generate visible output (tags in example manifest files)
based on those names.
Also, removes documentation topic for QML types from Qt Multimedia
Widgets as it doesn't have any.
Change-Id: Ic5f3b7a3094a1012f3c356f0195a8eb40d9d9e35
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
bool and gboolean are not necessarily the same size on all
architectures, and if gboolean is larger than bool then passing it
as an argument to g_object_get can trash the stack. In this case
overwriting some of the session pointer.
Change-Id: Iaa7be6a327e9f69212bd7d5bb372d33f2026db0f
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
This also makes sure that if you attempt to load an invalid media file
while another file is playing that the old session is stopped.
Task-number: QTBUG-30411
Change-Id: Ied4dbaffeac50465112c1e94e7c69d1600a6de51
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Dan Winkler <dantwinkler@gmail.com>
Default path and name of the output wave audio files were wrong. This
means the files did not have the right name to be opened on Windows, and
did not have the right path because they were being saved to the root
folder. (C:/ on windows, and / on OSX). Now we fall back to the default
filepath and name when we try to record without giving a path and
filename.
Task-number: QTBUG-28663
Change-Id: I8c782a31710cac65cd3c1ecd44de10b41c46e93d
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Disable the camera part as it's using APIs not supported for the PlayBook
Change-Id: I4e06a74e8a9e5a00e19e443b8aa304cf2bce2216
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
qgstreamermessage.cpp:48:12: warning: ‘wuchi’ defined but not used [-Wunused-variable]
qvideosurfacegstsink.cpp:383:1: warning: narrowing conversion of ‘4278190080u’ from ‘unsigned int’ to ‘int’ inside { } [-Wnarrowing]
Change-Id: I678e9eb39f3963e20109bb15c9c0c0d118b5a3b2
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
/camerabinresourcepolicy.cpp💯42: error: unused variable 'oldSet' [-Werror=unused-variable]
camerabincontrol.cpp:167:54: error: 'resourceSet' may be used uninitialized in this function [-Werror=maybe-uninitialized]
qaudiooutput_pulse.cpp:416:20: error: unused variable 'bytesWritten' [-Werror=unused-variable]
Change-Id: Idafd85b7985673f1f22d868b5f1b1e46a60ada4a
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This is because fftreal's pro file says:
static: error(This library cannot be built for static linkage)
Found due to a CI failure on win32-msvc2010_static_Windows_7.
Change-Id: I2a4630410fa7a1bb4e6ab158a4f7ae76d5cacd8a
Reviewed-by: Holger Ihrig <holger.ihrig@gmail.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
m3u8 is just a unicode version of m3u so we can already handle these
without any extra coding other than adding it as a format
Change-Id: Icec0f1844bd2b0a0ea3c39b98f7b06cc402a3309
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
When comparing the size of the WaveHeader and the chunk size, we need to
include the ID and Size fields, or any extra data won't be discarded and
the parsing will fail.
Change-Id: I730833f33f57b26cd750985354136191f7e7ce04
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Change-Id: I381e1b0883fb4fdc68627848ee39a26ce22e2ba5
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This also prevents anything meaningful from working, but it is a
good starting point.
Change-Id: Idaf495ec29f611ee5342c79318bc3ace1d852747
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
