| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
This way it also works custom mkspecs
Change-Id: I7414aac775b797da3487e9625c7212486118b532
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
|
|
|
|
|
|
|
|
|
| |
This should prevent the avfoundation plugin from being built on system
that can not support using it (ex. 32bit builds on OS X 10.7)
Task-number: QTBUG-36239
Change-Id: I9f861b7580b0e015ddbc1231440d677bf6eee1ec
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
No all QNX versions/variations have a mmrenderer by
default, so we need to check for it, otherwise
it fails to compile.
Change-Id: I3efe9df37cf7807c1b0ac4d2e8f49aa02e3408cd
Reviewed-by: Frank Osterfeld <frank.osterfeld@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Removed the configure test to enable or not the plugin (which solves
the problem of the plugin not being built on Windows because of a bug
in QMake). Even though it should work on other OpenSL ES
implementations than the Android one, it hasn't been tested. Compile
and use the plugin only on Android for now.
Task-number: QTBUG-34275
Change-Id: I02d47c8be3be8163a17c68b44b8c4b18a218a3fe
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Correctly return the list of available metadata.
On Windows Vista and later, we now use shell properties to retrieve the
metadata. This allows us to get much more metadata properties.
Task-number: QTBUG-30776
Change-Id: If542756d08d832903984ef10d09c4caf410bdb1c
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Removed QGstreamerVideoOverlay and related classes. It was used as
'Window' control but performs worse than QGstreamerVideoWindow which
does basically the same thing using GStreamer ready-made components
instead.
Removed X11 dependencies and related configuration tests. It was only
needed for QGstreamerVideoOverlay.
Change-Id: I2ad2636ccf0060e56cd64f3d9e5b3c24dc75f5a3
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/plugins.pro
Change-Id: Ieec8b5984b0fba97872bf96c38410369dc0e20cf
|
| |
| |
| |
| |
| |
| |
| |
| | |
The one public port of this library to Qt 5 changed the .pc to libresourceqt5,
to avoid clashing with the Qt 4 version.
Change-Id: I6a248606e20c4e7a8f432612ca00aded846264d9
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
|
|/
|
|
|
|
|
|
| |
Adds support for QAudioOutput, QAudioInput and QAudioDeviceInfo using
OpenSL ES 1.0.1. This plugin is used on Android.
Change-Id: Idf2c22a861e067196f6c5139e51393b086f64183
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The qtCompileTest function in configure.prf does not work when
cross-compiling on Windows because it detects the wrong make executable.
And it's anyway not the best way to do this, since what we really want
to check for is the existence of the SDK version, whereas the compile
test could potentially hide a lot of other problems under the same
error message.
Task-number: QTBUG-31405
Change-Id: I2c16b214e40bac5751d4e7098edcc30318756621
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
| |
Change-Id: Ia8c1c38aba1544603fada8c414cc856f365fd15b
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Ifd152513074e6b7802a3ed6d4722ba78762ec79c
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Moved it to the separate plugin as the rest of gstreamer based services;
Updated with libqgsttools_p changes;
Implemented QMediaRecorder::status property;
Made gst_photography dependency optional,
it's not always available on desktop;
Added video recording case to auto integration test;
Moved backend implementation into qt namespace
Task-number: QTBUG-26046
Change-Id: Iacfc1a6e263a4c0201d5eb28d04c960b87a230c0
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
|
|
| |
There's a different prefix here.
Change-Id: Ifda82e19824801b1d903ab6ad40c97428fff236c
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- load(qt_module) => load(qt_build_config)
- remove:
- CONFIG+=module (obsolete)
- code relating to module version headers (automated now)
- %mastercontent assignment (automated now)
- QT_BUILD_*_LIB defines (automated now)
- pointless QPRO_PWD assignments
- pointless DEFINES+=QT_MAKEDLL
- pointless and commented out include and depend paths
- qmake -project boilerplate
Change-Id: I8f4586403848fe8f2dff4e889b389956ffcdea59
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
| |
Change-Id: Ib56d0cb24065c1f990aee5d7f41bfedfe75332a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
| |
Change-Id: I15ad0f30859a3133993f0a75ed0d09bb5ef9cdf5
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
|
|
|
|
|
|
|
|
| |
remove assignmets which are defaults or bogus
Change-Id: I7130f22a66b294f92b0ed03749895136d0890a64
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
| |
Change-Id: I5eebe662ecbce9814ed3e763db56df9be737d11f
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: I20e5215108c6ebd5f8474fed5c3665118e4791e6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Replace Nokia contact email address with Qt Project website.
Change-Id: Ie8cd560b6d9a2c6e552b6be1ad8bc96c80a6535c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
Update headers from before 2011 that were missed in the previous commit.
Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Since it's not guaranteed that other Qt modules will be built by the
time qmake is run (and config.tests are created) we can't rely on
compilation. Just check the module.pri variable for widgets instead.
Change-Id: I352cf6427b748b89b69ec17588ce0dd83065090f
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
It does use a config test for now, just to make it clearer. The Mac
backend currently requires widgets, but most of the others should work
without it (just not supporting QVideoWidget/WindowControl).
The QVideoDeviceControl interface was modified to remove the QIcon
usage - it was never implemented.
Unfortunately even the QML examples need widgets for the wrapper
application, and will need to be ported to QtGui based wrapper.
Change-Id: I8a55ad5cf09ab51749510bf16f49de0bd3f0bcdb
Reviewed-by: Ling Hu <ling.hu@nokia.com>
|
|
|
|
|
| |
Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
|
|
| |
The X11 buffer pool was using outdated APIs, and as the 'qpa'
configuration value is being removed, it caused the X11 code
to be pulled in, and therefore cause compilation failures.
Change-Id: I5fdaed854c6525716fccca44b5fbd0b850880cb9
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
|
|
|
| |
Using "this" in non member function, oops.
Change-Id: I7cda3eea755099af2ff2df7b777e3e228e53e325
Reviewed-by: Sergey Dubitskiy <sergey.dubitskiy@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
The config test which still exists in QtBase should be removed at a
later date, together with pulseaudio and gstreamer config tests.
Change-Id: I4bea45ab69d1bac10814fc60ecf24dbc859b0f20
Reviewed-on: http://codereview.qt-project.org/6643
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Cleaned up configuration of gstreamer with a separate config
test.
Change-Id: I1ec9ee466233687fbcfdc544a12d9fce578e4379
Reviewed-on: http://codereview.qt-project.org/6459
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In some versions of Microsoft Windows SDK v6.0A, the qedit.h header is
present, but dxtrans.h (which is #included by qedit.h) is missing.
The standard workaround for this issue is already used by
plugins/multimedia/directshow/camera/dscamerasession.h; this commit adds
the same workaround to the config test.
Reviewed-by: Michael Goddard
Reviewed-by: Ling Hu
(cherry picked from commit e3c07dc9dd6a9f7930ca3c61cfd667d816731ce1)
Change-Id: Ia53c4f6b3efc86e2447a39e6d95e7f67d7e46b5d
Reviewed-on: http://codereview.qt-project.org/5498
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
directshow camera backend requires header qedit.h(currently removed since Windows SDK v7.0),
so if there is only Windows SDK v7.0, directshow backend should be disabled, since the directshow
mediaplayer will also be replaced by wmf backend.
Change-Id: I0de60fdcb683a57cc0aa3570f769179afc0c581b
Reviewed-by:Michael Goddard
(cherry picked from commit 68d78008f9d1eb82de673b8f4c8e73bdde2150c2)
Reviewed-on: http://codereview.qt-project.org/5494
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Windows SDK v7.0 is required to compile the WMF backend,
so add additional check for MENonFatalError.
Change-Id: I3edb86b8132b8022b30c02ea6289f617aadfc683
Reviewed-by: Michael Goddard
(cherry picked from commit b738126352e5d914ea366b2725b72e2306b39ee2)
Reviewed-on: http://codereview.qt-project.org/5493
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
|
|
|
|
| |
MeeGo uses this too.
Change-Id: I0b7ec00538289d4a3beea62da08233c0d1eb45a2
Reviewed-on: http://codereview.qt-project.org/5447
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
|
|\
| |
| |
| | |
Change-Id: Iec6f96e3713257d25f7b1e06c6da9c153b23800b
|
| |
| |
| |
| |
| |
| |
| | |
Change-Id: Ieb08df492e7b9cbfe35e93a056685cfdac6e704e
Reviewed-on: http://codereview.qt.nokia.com/2994
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|/
|
|
|
|
|
| |
Change-Id: Icbdd1bdae223192465b8c84faeb99b01be154275
Reviewed-on: http://codereview.qt.nokia.com/2605
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number:QTMOBILITY-1606
Reviewed-by: Michael Goddard
(cherry picked from commit bdf3a9b39661cfb836245139d02e95e854646a7e)
(cherry picked from commit 8d2370953eb32bf44a037244e0d9f9b484875f7a)
Change-Id: I07790b8c540a04e4e19a3d018a4884a773e980bf
Reviewed-on: http://codereview.qt.nokia.com/2086
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Ling Hu <ling.hu@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Add the list of tests to sync.profile, and make sure each test only happens
on the platforms it's intended for.
Change-Id: Id022a6b85b349f4a8a649d3449b622e4ada7f4f4
Reviewed-on: http://codereview.qt.nokia.com/1910
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Docs still need some fixing, but there are some legitimate usages of
it there.
Change-Id: I94c7b68788ce97829711a4384884d7e52fe84162
Reviewed-on: http://codereview.qt.nokia.com/1736
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I3a001f01ab7fd8cf63452126037b98c1b01df80d
Reviewed-on: http://codereview.qt.nokia.com/1797
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
|
|
|
|
|
|
|
|
| |
Replace old license header with correct one.
Change-Id: Ibff8fbea6595bb80f1122d55db2194accd319308
Reviewed-on: http://codereview.qt.nokia.com/1318
Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
|
|
Comes from original repo, with SHA1:
2c82d5611655e5967f5c5095af50c0991c4378b2
|