From 620af5f2aa113ba589a3a0ba95dff3a0dead6d2c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Fri, 20 Jan 2023 07:45:51 +0100 Subject: [PATCH] QtCore removed_api.cpp: fix missing instruction comment in 6.5 block Thanks to Ahmad for noting. Amends 6bc227a06a0d1392d220aa79ddb1cdc145d4f76e. Change-Id: Ie6191bfc21d69f88a9a135f0d5f6b4fa8b09e8ad Reviewed-by: Fabian Kosmale (cherry picked from commit 8d5ff757744c35e9c96d379ef5600cfbfaab609a) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/compat/removed_api.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp index adc20beda72..0efc81d430b 100644 --- a/src/corelib/compat/removed_api.cpp +++ b/src/corelib/compat/removed_api.cpp @@ -479,4 +479,8 @@ void QXmlStreamWriter::writeStartElement(const QString &namespaceUri, const QStr #include "qfloat16.h" #include "qstring.h" +// #include "qotherheader.h" +// // implement removed functions from qotherheader.h +// order sections alphabetically to reduce chances of merge conflicts + #endif // QT_CORE_REMOVED_SINCE(6, 5)