Merge remote-tracking branch 'origin/dev' into wip/qt6

Change-Id: I4ea2b77cc201daed94fbe321f146dfd20365a534

1 files changed, 1 insertions, 4 deletions

diff --git a/src/tools/rcc/rcc.cpp b/src/tools/rcc/rcc.cpp
index 08fb6fca5f..94f6911010 100644
--- a/src/tools/rcc/rcc.cpp
+++ b/src/tools/rcc/rcc.cpp
@@ -67,11 +67,8 @@ enum {
 #  define CONSTANT_COMPRESSALGO_DEFAULT     RCCResourceLibrary::CompressionAlgorithm::None
 #endif
 
-#define writeString(s) write(s, sizeof(s))
-
 void RCCResourceLibrary::write(const char *str, int len)
 {
-    --len; // trailing \0 on string literals...
     int n = m_out.size();
     m_out.resize(n + len);
     memcpy(m_out.data() + n, str, len);
@@ -983,7 +980,7 @@ void RCCResourceLibrary::writeDecimal(int value)
     Q_ASSERT(m_format != RCCResourceLibrary::Binary);
     char buf[std::numeric_limits<int>::digits10 + 2];
     int n = snprintf(buf, sizeof(buf), "%d", value);
-    write(buf, n + 1);  // write() takes a size including terminating NUL
+    write(buf, n);
 }
 
 static const char hexDigits[] = "0123456789abcdef";