summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgpl5.15Tarja Sundqvist2022-08-161-1/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I6c367c0f2b9609ce45fb9522a546be508e449c70
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-05-161-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I420317b3aae2dd9380cba6ee8da9fffb1c86981e
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: I9b7852727e682903ce1f324ddedd4ab411b6f3bb
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-076-25/+255
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I6568139d7193f5b04b50f0f31ddff4d9bac8e65a
| * tst_qvideoframe: Increase buffer sizes used in image() testsDmitry Shachnev2021-04-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | YUV420P and YV12 formats use three planes which need 18432 bytes in total: - height × bytesPerLine = 64 × 256 = 16384 bytes; - height/2 × width/2 × uvPixelStride = 32 × 32 × 1 = 1024 bytes; - height/2 × width/2 × uvPixelStride = 32 × 32 × 1 = 1024 bytes. NV12 and NV21 formats use two planes which need 24576 bytes in total: - height × bytesPerLine = 64 × 256 = 16384 bytes; - height/2 × bytesPerLine = 32 × 256 = 8192 bytes. Fixes https://bugs.debian.org/982973. Change-Id: I68433dbb5370a6e4cdd2a85e2a9554fab642f5b6 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 1c2a8655ac3dd5f8de5294a77ac5e585add82229) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * AVFoundation: Only remove the video output if it is still attachedAndy Shaw2021-04-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | If the video output is no longer attached then it will cause a crash if you try to remove it, so we need to check it is attached before removing. Change-Id: I90a119ae8e605ee88740248c94c7cea03acf4d50 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 8b72da5f4b2d81444c731bc4e8eafca59e693bf6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| * macOS: Fix video rendering on with OpenGL Core profilePablo Luis Garcia2021-03-303-19/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | CoreAnimation OpenGL renderer only has support for pre 3.0 profiles. Changed CoreAnimation renderer to use a Metal texture for rendering and use a pixel buffer to share the texture data with an OpenGL texture, making it possible to render with 3.2+ profiles. Fixes: QTBUG-51064 Fixes: QTBUG-62694 Change-Id: I48a4a6e0d8fbc48170dfe82d1e71cd265d70179a Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit abab792c4f0977a4599e5b7b2e97a5ee586fe388) Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: I2b16e3e106a6bd672ffc092a68f8d39bc4b6c0a8
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-25966-19977/+19977
|/ | | | | | | | | | | This reverts commit 80d46e3a5f64ff2456c40bdba63b6d5c69a32cdd. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I5c64ffa120f916711e5cf01c828774f8456dec06 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* imx6 video plugin depends on gstreamerSamuli Piippo2021-02-171-1/+1
| | | | | | | | | | Build the imx6 videnode plugin only if gstreamer is available. Fixes: QTBUG-91154 Change-Id: Ifdbd88fb2fb40c3bc99c641936dd87ec36a42f59 Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> (cherry picked from commit e10622759d179f8ae304c0bef8a6f56ea7d0dc23) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix typoPaul Wicking2021-02-101-1/+1
| | | | | | | | Fixes: QTBUG-90997 Change-Id: Ib007ebf6c9459df3583fd44b0347827514e90d83 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io> (cherry picked from commit fcb3c8bfb84038462258ae242da9bcb8e9c2389e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update commercial license headersTarja Sundqvist2021-01-27966-19977/+19977
| | | | | | | | | | | | | | | | Updated header.COMM to files in tqtc-qtmultimedia. Examples, tests or documentation files are not updated. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reaso for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4171 Change-Id: I86ebf7c3653b55983cefff246c0cb019cbcda8c4 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Revert "Map QVideoFrame::Format_Y8=>QImage::Format_Grayscale8 in QVideoFrame"Andy Shaw2020-11-304-9/+5
| | | | | | | | | | | | This reverts commit 2b96c113cf7057b556856149114999b973b3f2c2, due to the fact that it introduces a problem with existing cameras on Windows. So reverting for now until a fix can be found. Change-Id: Ica59c8a68de7aecf6a4ebd1bd044363e9acefd93 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 67d1ff140e60e3372d05fc7af2cf85de891a31f0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add changes file for Qt 5.15.2Antti Kokko2020-11-041-0/+29
| | | | | | | | | | | | | | | | - 6d70c875615ffc9c315e203530aac0d320185701 Add changes file for Qt 5.15.1 + fd2bb11b9c9f4a0cff99ed21d9e5291ff5ec065d AVF: Introduce QCameraCaptureDestinationControl_iid + b34065e03e467d2c2b7a04e84bbec815f595220c CameraBin: unset GValues after finish using them + 9862bf04d18d8453c5bf2667768c0b8fbafe512c Gstreamer: fix camerabin's supported focus point mode + 67cac1524f56af09289eb76b5e2a38ca6d2a78c6 DirectShow: Use also pin category when negotiating + 4b26133b1cac084a61dbbf68b3fff711ca49f712 Bump version + 4ca84a8ae95d2703d2459d6335c4420ae32b37b6 Fix nullptr dereference in directshow plugin + 732b1abff8eaa6ac5ff0414aea25ad7617dab2e8 Add changes file for Qt 5.12.10 Change-Id: I4f45ad937938681a7a233e975ce9290ddaa84105 Reviewed-by: Christian Strømme <christian.stromme@qt.io> (cherry picked from commit fd30913d4601d12437404e1d20113a1ed6364ccc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: Iba4de35238fedfa798b366a4e36aed63405a6583
* Add changes file for Qt 5.12.10Antti Kokko2020-10-261-0/+28
| | | | | | | Change-Id: Ic670af0c1e8ef7962bddda0f0a3b7f547ae25e69 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 67ab370d6a87d3b44e1cc4efb0f3fc57d5ac751e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix nullptr dereference in directshow pluginLuca Carlon2020-10-211-1/+2
| | | | | | | | | | Init pointer before trying to dereference it in directshow plugin. This fixes a crash trying to play a video when QT_DIRECTSHOW_NO_EVR is set. Change-Id: Ie42eff035bd7fe173ca629c68b1228dc760c717d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit c6e934601a3405f80c601aac207b09588e291b89) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I627825062e6ee71998c136e3489a7c33011b8c76
* DirectShow: Use also pin category when negotiatingVal Doroshchuk2020-09-244-42/+57
| | | | | | | | | | The pin should be negotiated once and use PIN_CATEGORY_CAPTURE. The same logic is implemented in chromium. Change-Id: I89ac13c1a7e982c1011b2a872e853ee5bc2036b2 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit bf82ab669c53c4b9abb724e197252a788323095e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Gstreamer: fix camerabin's supported focus point modeRatchanan Srirattanamet2020-09-231-2/+0
| | | | | | | | | | | | | | Commit be7fef656a1d087d3d1d3fa102da4fce85855935 (Add support for face detection focus point mode to camerabin backend.) updated camerabin's isFocusPointModeSupported() to indicates face detection mode support. However, it forgets to remove the old code that says only auto and custom is supported, making the face detection never reported as supported. Change-Id: I76627e0b72fb94cd1370bc990edd6c748086a5d9 Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io> (cherry picked from commit ce6440c999c34a2b80fa25121e893eccf68203a5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CameraBin: unset GValues after finish using themRatchanan Srirattanamet2020-09-111-0/+3
| | | | | | | | | | | GValue can contain allocated memory. Not unsetting it can cause memory leak. This patch adds g_value_unset() calls to various places that miss ones. Change-Id: I78e0f8f6c558ada0e7828c11094132359c579c2a Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io> (cherry picked from commit 24ac478e50dab189b53c749b34971a807aa6da4d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* AVF: Introduce QCameraCaptureDestinationControl_iidVal Doroshchuk2020-09-107-11/+169
| | | | | | | | | | | | | | | | | | | | | Can be used like: QCameraImageCapture->setCaptureDestination( QCameraImageCapture::CaptureToBuffer | QCameraImageCapture::CaptureToFile); Both CaptureToBuffer and CaptureToFile are supported. If CaptureToBuffer is requested, then it sends imageAvailble signal If CaptureToFile is requested, it sends imageSaved imageCaptured is sent only if there is the video frame available. (e.g. when abstract video surface is used as viewfinder) Fixes: QTBUG-85470 Change-Id: If22281e4d0eacfb0d38f8b1c8b676191817f592e Reviewed-by: Ihor Dutchak <ihor.youw@gmail.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit cdd87907722aff14c393dba02b7e43c924b60d06) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add changes file for Qt 5.15.1Antti Kokko2020-09-031-0/+45
| | | | | | | Change-Id: Ida0d0494f46079ac3934742539965fe78a0d2f8c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit 73d9affb0c44dc21d83e9aeec5e4d83bc57d189b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: Ie596b8a54749b7dd6c2c069da8d77cb74369be0b
* GStreamer: Update render rect only if open gl sink is usedVaL Doroshchuk2020-07-201-1/+3
| | | | | | | | | | Only glimagesink requires updated render rect. Change-Id: Ib30bf364edda4cd088a1202bbd5c958b552ba999 Fixes: QTBUG-85545 Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io> (cherry picked from commit a553c7d1b63defc963a043e363f8d75d255e9c72) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add binary compatibility files for 5.15 for QtMultimediaMilla Pohjanheimo2020-07-132-0/+36065
| | | | | | | Binary compatibility files added. Change-Id: I9860ccffa2492e6cb5f9586ce4476b416e6a161f Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Compile with QT_NO_BEARERMANAGEMENTAndy Shaw2020-07-064-1/+25
| | | | | Change-Id: Ibd23ac674e8ba5c0b2d3cea619d0f823a058baab Reviewed-by: Val Doroshchuk <valentyn.doroshchuk@qt.io>
* Don't map QMemoryVideoBuffer when there is no data insideVaL Doroshchuk2020-06-302-1/+13
| | | | | | | | Task-number: QTBUG-85202 Change-Id: If40af4af211af86311c0e04a8bdd0627dc34a939 Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit d97efea0caaa9741f21e7e30b394d292ea80c9b0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: minor fixes re the camera documentationAndy Shaw2020-06-153-1/+3
| | | | | | | Change-Id: I8fbff45f5ebae681ab37cfd0ab0acb79eec88864 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> (cherry picked from commit f730fa8d3eaefdcd44f57c49c468344da56bb041) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing overrideAlexander Volkov2020-06-109-127/+127
| | | | | | | Change-Id: I0ec719a26ad6c146e44f8e9e41b186a53cb254a9 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> (cherry picked from commit 121c0c4028d6deceded8e600959f10c364986634) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CoreAudio: Don't apply audio category if it is not neededVal Doroshchuk2020-06-094-18/+12
| | | | | | | | | | | | | | | | | | | If just devices are requested, no need to apply any categories with activation of audio device. Postpone setting category and activating audio until actual playing is requested. Categories/options for input devices: AVAudioSessionCategoryPlayAndRecord with AVAudioSessionCategoryOptionMixWithOthers For output: AVAudioSessionCategoryAmbient with no options. Fixes: QTBUG-83776 Change-Id: I9364bdea2882bc23039817207eca62b311841ba6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit b5a55492a63cb2cda75d6f980acb7fc5ae8dfc22) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* GStreamer: Start playback when bufferedVaL Doroshchuk2020-06-091-1/+1
| | | | | | | | | | | Regression since d8d072417b08dd75734b3f0aa86c3a49db934770 Fixes: QTBUG-84556 Change-Id: I557ac7eb38ebdbb6c52e5348902ee8c3f1a91f07 Reviewed-by: <roman.valov@gmail.com> Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 19cc3a018f2442221d566ec56bda2bdbdce7ec2e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* AVFoundation: fix playback of files with spaces in their namesNick Korotysh2020-06-021-7/+7
| | | | | | | | | | | | | | | | | | Used QUrl::toEncoded() instead of QUrl::toString(). Usage of QUrl::toString() leads to URLs which can contain spaces and as result such URLs are not accepted by AVPlayer, and it remains in unknown state because AVFMediaPlayerSession::processLoadStateChange() is not called at all. And as result, QMediaPlayer waits media loading forever. [ChangeLog][Platform Specific Changes][AVFoundation] Fixed playback of files with spaces in their names. Fixes: QTBUG-84585 Change-Id: I69e522d048d88310803a7040f114ee808c18720b Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> (cherry picked from commit 9c16be3d9d956f612dda431f4883eab3b09a8b67) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Map QVideoFrame::Format_Y8=>QImage::Format_Grayscale8 in QVideoFrameVaL Doroshchuk2020-06-024-5/+9
| | | | | | | | Fixes: QTBUG-52455 Change-Id: I30582582935ae0a2c5094db995cba83b62adc767 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 2b96c113cf7057b556856149114999b973b3f2c2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* GStreamer: Remove dependency to gstreamer_imxcommonVaL Doroshchuk2020-05-293-31/+9
| | | | | | | | | | | | gstreamer_imxcommon is not official plugin. Added extracting of physical memory instead. Available since gst 1.14. Fixes: QTBUG-83663 Change-Id: I4c2823f1a965c1fc5a5ab9e50ab8325884f8f6e1 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit c94342497120dd8eb640afbeb770c01b0d717634) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* gsttools: do not use nullptr in C codeRolf Eike Beer2020-05-291-8/+8
| | | | | | | | | Changing this in "gsttools: use nullptr instead of NULL" was an oversight. Change-Id: I6ed4a63800dc288a32c58eafaf74cdc15ea2218d Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> (cherry picked from commit ce0ae3f3bfed03e3eb334165f9dbf1151a9f9e5d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* iMX: Introduce QT_GSTREAMER_PLAYBIN_CONVERT to inject a converter in playbinVaL Doroshchuk2020-05-281-1/+9
| | | | | | | | | | Injects a converter between decoders and video sink. Task-number: QTBUG-76179 Change-Id: If5fc8090bc1ade424a1157e94d83dc5a51051fd7 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit 92658f152656f6d8373e79be0b2bfe331857560a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-149-7/+71
|\ | | | | | | Change-Id: I9525c18e6a29b8c6cbe3398264a096bde24eca10
| * Merge remote-tracking branch 'origin/5.14' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Qt Forward Merge Bot2020-04-277-7/+7
| |\ | | | | | | | | | Change-Id: I6df92f98db7c18dcecdc831d46748d8111dffacb
| | * Fix case of header file includes for building with mingw-w645.14Marius Kittler2020-04-266-6/+6
| | | | | | | | | | | | | | | Change-Id: Ie0e6599234c38c5e5a75b681a911f3728871861e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * WindowsAudio: Send stateChanged when QAudioOutput::reset() is calledVal Doroshchuk2020-04-231-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-83240 Change-Id: Iaa01ee4553f4c0c4d9a1ad829e65b40f13d3847d Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * | Fix warning about QNetworkConfiguration being deprecatedThiago Macieira2020-04-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | It's going away in Qt 6.0. Task-number: QTBUG-83692 Change-Id: I9709abb1c3734e10a7defffd1607e1160da1e75c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * | Merge 5.15 into 5.15.0Alexandru Croitor2020-04-235-7/+64
| |\ \ | | | | | | | | | | | | Change-Id: I98beddaeb5a0508f5790a9fed2ef74044a8043e9
| * | | Add changes file for Qt 5.15.0Antti Kokko2020-04-211-0/+57
| | | | | | | | | | | | | | | | | | | | Change-Id: I702f45ee8ab811b068ccde6de13cb754544e93e7 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | | Remove QRadioTuner from index pageKai Koehne2020-05-111-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It got deprecated in f1648c837b606cb Change-Id: I3f99a5373b0641f15e62ec4270e89c582e451fdb Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io> (cherry picked from commit c95aa0e1836f230b2ba3158c65d0767223dd1937) Reviewed-by: Qt Cherry-pick Bot
* | | | Vivante: Keep only one frameVaL Doroshchuk2020-05-112-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The imx6 vivante implementation of videonode used by qtvideosink holds reference to two frames during rendering. It releases the first frame only when it receives the third frame. This makes jerky playback when frames are not coming at constant rate. It displays the previous frame during video playback. Change-Id: If306bdcd358fac46a1fd0000ccb068424aee813a Reviewed-by: Karim Pinter <karim.pinter@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | | GStreamer: Fix reverse playbackVaL Doroshchuk2020-05-081-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each gstreamer plugin is responsible for supporting reverse playback and also might require different start/stop types (GST_SEEK_TYPE_SET, GST_SEEK_TYPE_NONE, GST_SEEK_TYPE_END). Some plugins do not support it at all, e.g. wavparse. if rate > 0: change rate from current position to duration. else: change rate from current position to 0. Fixed also seeking with a negative rate. This should work for mp3 or some video formats too. Fixes: QTBUG-83945 Change-Id: I10a98186b9bc63d908667944aa4459da9e63e343 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | | | Suppress QMediaNetworkAccessControl related deprecation warningsMårten Nordheim2020-04-271-0/+9
| |/ / |/| | | | | | | | | | | Change-Id: Ifb64b01463115f81b2edc4e486a3b0f52197e2a1 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+45
|\ \ \ | | |/ | |/| | | | Change-Id: I275882053a3c21e31e05b1583183e87942c9d720