summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix usage of unsupported Exif constructor on Android 66.2Samuel Mira2022-04-192-4/+14
| | | | | | | | | | | | | | QtCameraListener used ExifInterface(InputStream stream) constructor that was added in API 24 while the mininum support is Android 6 API 23. The fix consists in using ExifInterface(String filename) constructor present since API 5. To use that constructor, it is necessary to save the data to a temporary file for ExifInterface to use. Fixes: QTBUG-99228 Change-Id: Ib39e8da696c64c20e4afcd3f71dd0e7abdea5ee6 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 6ccb976f4f9693ad7c6881a186fd6af0f05ff023) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* darwin: Don't specify source format hint for audio recordingDoris Verria2022-04-054-18/+55
| | | | | | | | | | | | | | | | | | | | | | | We were initializing the audio writer input with a format hint equal to the audio capture device's active format. This is wrong as we can't ensure that the captured audio buffers will be in that same format. This caused failure in recording because the captured audio buffers had the kAudioFormatFlagIsNonInterleaved set, while the format hint didn't, causing the internal calls to the AudioConverter to fail with errors. To fix, do not specify a format hint but instead setup the audio settings dictionary with the necessary keys. Force a default value for AVNumberOfChannelsKey since it is now required, and for recording with more than 2 channels, provide a supported channel layout. Fixes: QTBUG-98262 Done-with: Vladimir Belyavsky <belyavskyv@gmail.com> Change-Id: I537d82e729c91a66d85aaa61c563a1ecd1a91af3 Reviewed-by: Vladimir Belyavsky <belyavskyv@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 980c145069c589085b4dee4b4c2b69e3b1a0adc3) Reviewed-by: Doris Verria <doris.verria@qt.io>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-04-011-3/+3
| | | | | Change-Id: Ife6dd729ea7036a85974b9dc6a24df3de3b26c4e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QVideoWindow: disconnect videoFrameChanged signal when destroyingRafael Roquetto2022-04-011-0/+3
| | | | | | | | | | | | Prevent signal from invoking methods on a half-destroyed object. It can happen when a video sink is trying to set a default frame prior to the sink itself being destructed, if that destruction is a side-effect of the video window destuctor itself. Change-Id: I49ad1e2d0fe28040bf32648fa76e3de8b08d0f0e Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 71c5377235b9e37be9c0eb25671e23484e289fad) Reviewed-by: Rafael Roquetto <rafael.roquetto@qt.io>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-03-311-3/+3
| | | | | Change-Id: Ib3eb92111ed4b8d280bccec08408a5f4c547525c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Fix Multimedia auto test videoDimension on AndroidSamuel Mira2022-03-295-7/+33
| | | | | | | | | | | Added a seekTo in the android mediaPlayer setPosition to update position and a function on videooutput to render one single frame. Both changes were added for consistency between different platforms. Fixes: QTBUG-99361 Change-Id: I2ad0d1bb71ddd7cbc31a97587506050b9969fdd0 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 78891c03ec3675373ef6b54559d244cda32a9402)
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-03-241-3/+3
| | | | | Change-Id: Id02094f7450d0132857718f27e1f2bcb36c5dca9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* QVideoSink: update documentationRafael Roquetto2022-03-231-4/+2
| | | | | | | | | | Remove reference to the "native window mode of operation", as it is no longer supported since at least Qt 6.2. Change-Id: I7e553ddccd45b4c8b134ba058ade34f064fb5a24 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit ba7a6634e3e5387803aa72e7f9f243f550fae256) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* AVFCameraSession - don't use preview layerTimur Pocheptsov2022-03-211-6/+1
| | | | | | | | | | | | | | | | It's not in use essentially and was a legacy when we, indeed, were adding it as a sub-layer in a view. Starting from macOS Monterey, creating such a layer using +layerWithSession: results in a broken AVCaptureSession - frames/sample buffers stop coming after the first 25 frames. Also, qt application may break other non-qt apps, having their own capture session/viewfinders frozen too. Fixes: QTBUG-99641 Change-Id: I75dfba5db0d50bd015fcd6904a0c5c8ea800230f Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit f7dc6003acfbbd93444c6ae99871404a4cc8f4d2) Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Fix conversion from YUV422 to RGBMitch Curtis2022-03-181-3/+1
| | | | | | | Change-Id: I3e4409f40bb97c4e1f1cfafa406ebd34e16da390 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 755116275005da6c6c46246197969780a4269a83) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove the code-signing step from examplesDoris Verria2022-03-1714-131/+0
| | | | | | | | | | | | | Codesigning with entitlements is not needed unless the hardened-runtime option is enabled, so we can remove this post-build step. Fixes: QTBUG-101719 Change-Id: I35181220dbe4ef6b59072dcd3e76f066ab85db60 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit fa8e9a39bfbffaa23200a88bb700e86490389183) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Windows: Restore device session state when ending media recordingsAndré de la Rocha2022-03-172-5/+15
| | | | | | | | | | | | | The device session active/inactive status should be restored after the end of media recordings, otherwise the input devices may remain in use and cause other issues. Fixes: QTBUG-101434 Fixes: QTBUG-101591 Change-Id: I35c8ed7a36556472b7c015e6fd2044aac40314eb Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 152530f9295ec7580b93c68640cca09484dbeb73) Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Windows: Rework workaround for WMF issueAndré de la Rocha2022-03-173-2/+7
| | | | | | | | | | | | | | | | What seems to be a WMF issue was causing a crash with specific videos and also issues when changing position of flac files. A previous workaround for it was depending on the way the media playing was started and thus seemed to fix the issue when tested with the Widgets-based Media Player example, but still failed with the QML-based one. This patch seems to fix it for all cases. Fixes: QTBUG-100854 Fixes: QTBUG-100181 Change-Id: I7e46d72b5e656383442d2866ef93f3183c9f9fa7 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit b068cb359996d0a5125b3b8bc341854674b7cbb7) Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Windows: Avoid WMF error with some specific video filesAndré de la Rocha2022-03-171-0/+8
| | | | | | | | | | | | | Some specific video files cause a WMF error when played, possibly due to an issue in WMF, likely triggered by a non-standard setting in the files. However, the video files play fine when the error is ignored, which seems to cause no other issues. Fixes: QTBUG-100835 Change-Id: I7227c0bfbe3c1504e57ce3aec1c92c433879e618 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 6ed6d0ab838c8e9a808105376c5a92747f1a252c) Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Fix Unable to create OpenGL contextSamuel Mira2022-03-152-4/+58
| | | | | | | | | | | This patch complements patch 34bdc50c8a74d92348970e943b80b278b08471d7 Found, while running examples, that could be another code path that would trigger the same issue. This patch fixes those. Fixes: QTBUG-100773 Change-Id: I6382840092d38b967a126470d0354dc411c25258 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 36f110e6c97e2c98ded86945825aa563fd93f2e0)
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-03-151-3/+3
| | | | | Change-Id: Ia49aedd4ee46eaf38aa6d06f2ac490ff66d8258f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-03-141-3/+3
| | | | | Change-Id: If55ae1d425e47f45100495768d931a65c94eca2e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-03-101-3/+3
| | | | | Change-Id: I11bc0eb65a9cd07e39f14202aeec1bb007dd4d82 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-03-081-3/+3
| | | | | Change-Id: I5477b262687357dc74478eb27683eda98ca5aa7e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-03-041-3/+3
| | | | | Change-Id: I4a0e06ee3c6026ea8b900f7e2e760bddc6507f67 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* AVFoundation plugin (iOS) fix minor build problemsTimur Pocheptsov2022-03-032-28/+4
| | | | | | | | | | | Delete unused functions, move the unused (on iOS) declaration into the corresponding macOS-specific part of code. Minor: update some copyright headers (dates). Change-Id: Ie46452b705db6d7a5918273849b4cffc752a9660 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit 476137ff3307c8d868c9aff71d2bd9fd404113cb)
* Windows: Fix lack of precision in positioning while playing flacAndré de la Rocha2022-03-012-1/+3
| | | | | | | | | | | | | | | | | When changing the position while playing a flac file, the actually played position is not the one specified precisely; it seems to snap to some low precision point. However, the precise position is being specified correctly at the WMF level, and flac files not being handled differently in any way. This behavior seems to be caused by an issue in WMF. However, it seems that resetting the audio output routing when playing the file for the first time avoids the issue without causing side effects. Fixes: QTBUG-100181 Change-Id: Ifbf7770df0040231dc1b75edd9b2b34d6c870ef0 Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit aeff72e2b875b69a2d4d4d1e186da33130d4d94d) Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-02-171-3/+3
| | | | | Change-Id: Ic1e2b25545dc8021afe9523b5102a1579e7acf82 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Resolve QSoundEffect URL through QML contextPiotr Srebrny2022-02-173-8/+94
| | | | | | | | | | Simiar to QMediaPlayer resolve the source URL using QML context URL resolver. Fixes: QTBUG-100638 Change-Id: I4776e66abbb8689dd1941b23512e7f621c864a57 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 9c6ae9afddc0494cc93b8bf05e51944a4ddf5e26)
* Do not access NV_DX_interop functions out of OpenGL contextPiotr Srebrny2022-02-161-11/+13
| | | | | | | | | | | | | | | An attempt to use NV_DX_interop functions out of OpenGL context results in an exception. Thus, we do not unregister the D3D9 texture from the OpenGL context when it is gone. This patch also clears m_glHandle variable after it has been unregister in some rare case when we cannot lock it. Fixes: QTBUG-100665 Change-Id: Ie4bc02dbaccec12d92f8e274eeb420482a5f2d58 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 3893a5b88349f4086e003c3f51cffdf538131c6c)
* Avoid sending warning on per-frame basis, use debug message insteadPiotr Srebrny2022-02-161-10/+10
| | | | | | | | Fixes: QTBUG-100363 Change-Id: Ic0c39dce6c0d016cf6e59cba9e50f4d641a16543 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 1f9c3926687bac52ee794a99dcb19d66e11af24c) Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Use clockwise rotation for the QVideoFrame::rotationAngle()Piotr Srebrny2022-02-155-42/+38
| | | | | | | | | | | | | | | | | | | The counterclockwise rotation of rotationAngle() does not play well with the multmedia backends. The WMF MFVideoRotationFormat that describes the counterclockwise rotation of the picture, must be applied as clockwise rotation to render frame the correct way. This patch changes the interpretation of the rotationAngle() to be clockwise rotation. This fixes the rendering for WMF and gstreamer. AVFoundation is updated to account for the direction change. Fixes: QTBUG-100337 Change-Id: I284367629dad27fea95da52af4ca2d71d9412b09 Reviewed-by: Doris Verria <doris.verria@qt.io> Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 099e9a697b92e02666f308c1789c685990e45206) Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Avoid misleading error information, display proper loading errorPiotr Srebrny2022-02-142-2/+14
| | | | | | | | | | | QSample displays _decoder error_ when invalid URL is provided. This is misleading. This patch adds a proper message for these types of errors. Change-Id: I5416cf4e5b09a008e3b6af964fe65b48895c0c57 Reviewed-by: André de la Rocha <andre.rocha@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 72582b7e22080c2a03f180e128873ca0b566df6e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-02-101-3/+3
| | | | | Change-Id: Ibda86821f48c76d094f092eade805d0372f0201b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add missing #include <functional>Lars Knoll2022-02-093-0/+6
| | | | | | | | | Found during API review. Change-Id: I04a9439d3baa2149bead62c9c989677988a96959 Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 89939fc8fdd9e5756443f94ed510bacd4556fdf5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fallback on map/upload texture if texture handle is invalidPiotr Srebrny2022-02-091-7/+20
| | | | | | | | | | | | | There is no guarantee that QVideoFrame::textureHandle() will return a valid texture handle. In some backend implementations texture handle is generated after QVideoFrame is created in the mapTextures() call, which may fail. In such case, fallback to QVideoFrame::NoHandle branch. Fixes: QTBUG-100363 Change-Id: I0ae78b0abfa99af5e4579e454ea70711a8741178 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 8afe5d160c5a58e79f518d7483561ffbcb67d4e5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* AVFoundation plugin: protect the use of codec constantTimur Pocheptsov2022-02-091-1/+1
| | | | | | | | | It's not defined in older SDKs, so fails to build on macOS 10.15. Change-Id: I9518db080660d15eb0ef8af0c509e1062ada7113 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit f1babcc79a1693e134b9b12df3b4a5f922d42f89)
* doc: Correctly update typo in documentation of QMediaRecorderZhang Yong2022-02-092-2/+2
| | | | | | | | | | setMediaRecorder is replace with setRecorder. Fixes: QTBUG-100501 Change-Id: Ic761912c97166fdbee045282bbde57502a3e472b Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 04bda3e31c7e82e5eca2ac3f47164c80e3395b51) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove #include <qopengl.h> from the qt namespacePiotr Srebrny2022-02-091-1/+5
| | | | | | | | | A part of the change Iaca58f6cf92eb25aac52b780dadd6f38fe998204 that did not propagate to 6.2. Fixes: QTBUG-100347 Change-Id: Ie48d93584192283f757ee4371a342bcbe1c99db5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Switch examples to build as isolated sub-builds part 2Alexandru Croitor2022-02-051-1/+1
| | | | | | | | | | | | | | | | qt_examples_build_begin needs the EXTERNAL_BUILD flag to know that it's safe to build examples as ExternalProjects. It still won't do it in CI until we enable building examples as ExternalProjects for prefix builds. This is preparation for that. Task-number: QTBUG-90820 Change-Id: Ie7b3be8d74c1eb9e5f09dbe1819d56c2a42653fc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit b094da4bee0954f4e77b8c406d0c760741e31ca4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Windows: Fix player sending same position multiple timesAndré de la Rocha2022-02-022-9/+16
| | | | | | | | | | | | Under some conditions the player would keep sending the same position update notification multiple times. Fixes: QTBUG-100283 Change-Id: I6968b5e76794cf055b5bd6c4703f5a4fc68ae544 Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit a997f2cee2c8509aa597bb89e3c00eefe31c7564) Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Windows: Fix texture leak on media playerAndré de la Rocha2022-02-021-2/+4
| | | | | | | | | | | | Textures were being created in D3DPresentEngine::createVideoSamples() and never released. Fixes: QTBUG-100341 Change-Id: I31c9bbfa5a6a6b626685c45980adcbf23a473582 Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 7fa8e78cc2417ab245c2e662dc2ece77329fed31) Reviewed-by: André de la Rocha <andre.rocha@qt.io>
* Make the method usableLars Knoll2022-02-011-1/+1
| | | | | | | | | a const setter doesn't make a whole lot of sense. Change-Id: I8db0b91e968c9d4937bf7fd2bbba4f3a313cb49d Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit 6dcbeb896226bc452dd961cbc972d80739c27143) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-02-011-3/+3
| | | | | Change-Id: I3be22806bc83eba4aed103fe6995041774ad570f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.2.4Jani Heikkinen2022-02-011-1/+1
| | | | | Change-Id: Id5f0bf189012dc1d00425eb81d756d5dcf0443aa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* doc: Fix QImageCapture related snippetsSamuel Gaist2022-01-312-12/+20
| | | | | | | | | | | The code samples were not properly ported to take into account the changes from the Qt 5 code base. Fixes: QTBUG-99643 Change-Id: Ie30e39a3a4cdaff2c6881218a6f382396a3d5729 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> (cherry picked from commit e3a38654e668a73a3beb2544f68ca348b0f28dc8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: Fix qmlvideo seek issuePekka Gehör2022-01-312-2/+2
| | | | | | | | | After the fix, seek works s it should be. Task-number: QTBUG-99038 Change-Id: I6658dd3e860e88c9fee8e457d7cdcd31df840426 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit bc2c92b483d3a45e426722b50bf2f1e4ad97d648)
* QAndroidFormatsInfo: fix quadratic loop (eradicates Java-style iterators)Marc Mutz2022-01-291-7/+4
| | | | | | | | | | | | | | | | Calling QMutableListIterator::remove() in a loop is quadratic. Use Uniform Erasure erase_if, which is linear (uses std::remove_if under the hoods). Since std::remove_if() typically runs find_if() first, we can't modify elements from within erase_if()'s predicate. Factor the modifications to the elements into a separate loop. Change-Id: I04f951d9b7e05f210876a2f4065b33035c94df7a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 2bd1201df43a508f3f83af7b4995869fa7c4212a) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix Video.seek() methodLars Knoll2022-01-251-11/+5
| | | | | | | | | | | | | QMediaPlayer doesn't have a seek() method anymore, but a writable position property. Fixes: QTBUG-100106 Change-Id: Ia90b91abd850f1c61c9a226c5eced39ec8ed16b4 Reviewed-by: Samuel Mira <samuel.mira@qt.io> Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit cb90823b7cb68efe8cebb77035d929b790901f76) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Android: Fix qmlvideo metadata issuePekka Gehör2022-01-242-14/+17
| | | | | | | | | | After the fix, metadata of the video shown correctly on MetaData page. Task-number: QTBUG-99038 Change-Id: I3ef2d90c237d1740c550ff4537fe5184a88bea5f Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit b2ce9610ce434ce5e779f2ae1ce04260dd0cb5b6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix namespaced build on WindowsKai Köhne2022-01-203-4/+13
| | | | | | | Fixes: QTBUG-100050 Change-Id: Iaca58f6cf92eb25aac52b780dadd6f38fe998204 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit fb3b880052df64564cc2d4bde59c0877544b79c7)
* Fix rendering with OpenGL based RHI on macOSLars Knoll2022-01-203-4/+6
| | | | | | | | | | | | | Somehow we ended up having the wrong bit swizzling in the shader for the GL_TEXTURE_RECTANGLE shader. Also add some explanation about the SamplerRect pixel format to the documentation. Change-Id: I2f2ff25490ccc831988d5221a5c4b1ab541d777e Reviewed-by: Doris Verria <doris.verria@qt.io> (cherry picked from commit e03582ab5b99b0930742e26e00753b17871a8752) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-01-201-3/+3
| | | | | Change-Id: Idf9a15772d4501715774c15c263f1265fc2aea14 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* CMake: add install command for examplesSamuli Piippo2022-01-192-0/+24
| | | | | | | | Add install command to deploy the examples correctly. Change-Id: If9c24c4267a801078a4bf3f783587afeeb734be0 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit a0437e324bad99685072aa7f7a5fc4d20846bb12)
* Update dependencies on '6.2' in qt/qtmultimediaQt Submodule Update Bot2022-01-191-3/+3
| | | | | Change-Id: I04de1f1efc3add542e8836570df8a3a86a1fc6d6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>