| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: I5c9d59ac279bb52686b4226e95131276ca5248db
|
|
|
|
| |
Change-Id: I1b63a9942dcf2add939c713691cbac0ce98b2c0a
|
|
|
|
| |
Change-Id: Ice15109ddd7db4a0e33a477d3b196fb0b0cab129
|
|
|
|
| |
Change-Id: I564850b394eedbfde989a61dd745ab05e80e0d95
|
|
|
|
| |
Change-Id: Ic133584b2274e319c546b80f74b4781b3c15558d
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/directshow/player/directshowiosource.cpp
One side disintermediated filling a vector; the other reduced it to one entry.
src/plugins/directshow/player/directshowiosource.h
One side renamed a member, the other added another adjacent to it.
src/plugins/pulseaudio/qpulseaudioengine.h
One side added a header, the other replaced the next with a different header.
Change-Id: I3a031975f5af43ca39cca571f215c612f640b7d6
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Blacklisted a few functions in tst_QAudioInput.
Conflicts:
.qmake.conf
src/plugins/avfoundation/camera/avfcameracontrol.mm
src/plugins/avfoundation/camera/avfcameraservice.h
src/plugins/avfoundation/camera/avfcameraservice.mm
src/plugins/avfoundation/camera/avfcamerasession.h
src/plugins/avfoundation/camera/avfcamerasession.mm
src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.h
src/plugins/avfoundation/camera/avfcameraviewfindersettingscontrol.mm
src/plugins/avfoundation/camera/avfimagecapturecontrol.mm
src/plugins/avfoundation/camera/avfimageencodercontrol.mm
src/plugins/avfoundation/camera/avfmediarecordercontrol.h
src/plugins/avfoundation/camera/avfmediarecordercontrol.mm
tests/auto/integration/qaudioinput/BLACKLIST
Task-number: QTBUG-54459
Task-number: QTBUG-49736
Change-Id: I3a1fe8cef50b44d5c2785aaf4cf69fe3f16728e6
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
it's done centrally now.
Change-Id: I67cdafc4f2d419b05fc07bc1d1046afba95a3544
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| | |
| | |
| | |
| | | |
Change-Id: I2b6dc0d097a79d91d0c24cebadac1a891337f576
|
| | |
| | |
| | |
| | | |
Change-Id: I6d91859ec788c78384d527a421172a92315c994e
|
|/ /
| |
| |
| | |
Change-Id: I341cfb44a1e688d06a619e6d1a022648e4b33af8
|
|/
|
|
| |
Change-Id: If3189d01a1cfdf80bd76380a28e422c9b70df869
|
|
|
|
| |
Change-Id: Ie3aa84629ab6d8515f9db4924fb36a0dd8b0cb47
|
|
|
|
| |
Change-Id: I69b40c6f3f91f7abd33b119016712a4ca6f5d9f2
|
|
|
|
|
|
| |
Change-Id: I36439460978f1fd00a3f79b4192320cffd2df167
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
| |
Change-Id: I7a844aebaea0a82ee22e85df97d785929b996ef9
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
| |
Change-Id: Ibff36fc348efc7e3282de10a0c73bc68a2b7d4b5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
| |
Change-Id: Id5c4f69f35bd55f79797f36d766cfe0a6d665766
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-29838
Change-Id: I96527ba40ce7bcea851f05e9e9ab8d4492ef62e7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
| |
This follows suit with aeb036e in qtbase.
Change-Id: Ie8580d0a1f38ab9858b0e44c9f99bdc552a1752a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
|
|
Change-Id: Ie07a32729ec8679f799613f8f6ccdd9c1b6bf7c9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|