From 1a3efe224975769ae3c83cfaf4a2b5db87893b8f Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Tue, 21 Jan 2025 15:23:27 +0100 Subject: [PATCH] QFlags: add QT_NO_DATASTREAM checks to datastream operator declaration Amends 729c0960b84183bcf9576f974cb5e3b3c3fdc6ef. Found in Qt 6.9 API review. Change-Id: Ieb81fe000e61fef54a003f52789fa1475aac5239 Reviewed-by: Thiago Macieira Reviewed-by: Edward Welbourne (cherry picked from commit 348b680ae56e92f061424a10c4baa726cf7f15d2) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qflags.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index dc187ef4f65..0ec7f4383f5 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -206,8 +206,10 @@ private: return (it == end ? Int(0) : (Int(*it) | initializer_list_helper(it + 1, end))); } +#ifndef QT_NO_DATASTREAM template friend QDataStream &operator<<(QDataStream &, QFlags); template friend QDataStream &operator>>(QDataStream &, QFlags &); +#endif using Base::i; };