From a914b550edbb506bd01b5b5dff95274e9c0a72db Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Wed, 27 Sep 2023 10:33:40 +0200
Subject: [PATCH] Utils: Workaround warning about missing disabled warning

Change-Id: Icae1e30176fa5439a9e60be69b4eca754aca94d9
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
---
 src/libs/utils/smallstring.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/libs/utils/smallstring.h b/src/libs/utils/smallstring.h
index 16e872d5afa..03c27ce30bb 100644
--- a/src/libs/utils/smallstring.h
+++ b/src/libs/utils/smallstring.h
@@ -425,10 +425,9 @@ public:
         size_type newSize = oldSize + string.size();
 
         reserve(optimalCapacity(newSize));
-        QT_WARNING_PUSH
-        QT_WARNING_DISABLE_CLANG("-Wunsafe-buffer-usage")
-        std::char_traits<char>::copy(data() + oldSize, string.data(), string.size());
-        QT_WARNING_POP
+        std::char_traits<char>::copy(std::next(data(), static_cast<std::ptrdiff_t>(oldSize)),
+                                     string.data(),
+                                     string.size());
         setSize(newSize);
     }