Details
-
Bug
-
Resolution: Fixed
-
P1: Critical
-
6.5.0
-
None
-
-
82f7f3de0 (dev), eb3bbafe1 (6.5), 24972dafd (tqtc/lts-6.2)
Description
std::unary_function was removed with c++17
it seems we can just remove it to keep compiling:
diff -ur a/qtmultimedia/src/plugins/multimedia/darwin/camera/avfcamerautility.mm b/qtmultimedia/src/plugins/multimedia/darwin/camera/avfcamerautility.mm
— a/qtmultimedia/src/plugins/multimedia/darwin/camera/avfcamerautility.mm 2023-03-11 22:46:05.000000000 -0500
+++ b/qtmultimedia/src/plugins/multimedia/darwin/camera/avfcamerautility.mm 2023-04-01 19:30:45.489302095 -0400
@@ -69,7 +69,7 @@
}
};
-struct FormatHasNoFPSRange : std::unary_function<AVCaptureDeviceFormat *, bool>
+struct FormatHasNoFPSRange
{
bool operator() (AVCaptureDeviceFormat *format)
{
(we have been carrying this patch at conda-forge)
Attachments
For Gerrit Dashboard: QTBUG-113782 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
480183,2 | Remove std::unary_function usage | dev | qt/qtmultimedia | Status: MERGED | +2 | 0 |
480545,2 | Remove std::unary_function usage | 6.5 | qt/qtmultimedia | Status: MERGED | +2 | 0 |
507945,4 | Remove std::unary_function usage | tqtc/lts-6.2 | qt/tqtc-qtmultimedia | Status: MERGED | +2 | 0 |