1 files changed, 36 insertions, 20 deletions
diff --git a/tests/auto/tools/rcc/data/sizes/size-2-0-35-1.expected b/tests/auto/tools/rcc/data/sizes/size-2-0-35-1.expected
index f2c81fedf2..d858e15dba 100644
--- a/tests/auto/tools/rcc/data/sizes/size-2-0-35-1.expected
+++ b/tests/auto/tools/rcc/data/sizes/size-2-0-35-1.expected
@@ -1,29 +1,34 @@
 /****************************************************************************
 ** Resource object code
 **
-IGNORE: ** Created by: The Resource Compiler for Qt version 6.0.0
+IGNORE:** Created by: The Resource Compiler for Qt version 6.3.0
 **
 ** WARNING! All changes made in this file will be lost!
 *****************************************************************************/
 
+#ifdef _MSC_VER
+// disable informational message "function ... selected for automatic inline expansion"
+#pragma warning (disable: 4711)
+#endif
+
 static const unsigned char qt_resource_data[] = {
-IGNORE:   // /dev/qt5/qtbase/tests/auto/tools/rcc/data/sizes/data/data-35.txt
-  0x0,0x0,0x0,0x23,
-  0x30,
-  0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x20,0x30,0x31,0x32,0x33,0x34,0x35,
-  0x36,0x37,0x38,0x39,0x20,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x20,
-  0x31,0x32,
-IGNORE:   // /dev/qt5/qtbase/tests/auto/tools/rcc/data/sizes/data/data-2.txt
+IGNORE:  // D:/projects/qt/dev/src/qtbase/tests/auto/tools/rcc/data/sizes/data/data-2.txt
   0x0,0x0,0x0,0x2,
   0x30,
   0x31,
-IGNORE:   // /dev/qt5/qtbase/tests/auto/tools/rcc/data/sizes/data/data-1.txt
+IGNORE:    // D:/projects/qt/dev/src/qtbase/tests/auto/tools/rcc/data/sizes/data/data-1.txt
   0x0,0x0,0x0,0x1,
   0x40,
   
-IGNORE:   // /dev/qt5/qtbase/tests/auto/tools/rcc/data/sizes/data/data-0.txt
+IGNORE:    // D:/projects/qt/dev/src/qtbase/tests/auto/tools/rcc/data/sizes/data/data-0.txt
   0x0,0x0,0x0,0x0,
   
+IGNORE:    // D:/projects/qt/dev/src/qtbase/tests/auto/tools/rcc/data/sizes/data/data-35.txt
+  0x0,0x0,0x0,0x23,
+  0x30,
+  0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x20,0x30,0x31,0x32,0x33,0x34,0x35,
+  0x36,0x37,0x38,0x39,0x20,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x20,
+  0x31,0x32,
   
 };
 
@@ -33,11 +38,6 @@ static const unsigned char qt_resource_name[] = {
   0x0,0x6,0xa8,0xa1,
   0x0,0x64,
   0x0,0x61,0x0,0x74,0x0,0x61,
-    // data-35.txt
-  0x0,0xb,
-  0x0,0xb5,0x4f,0x74,
-  0x0,0x64,
-  0x0,0x61,0x0,0x74,0x0,0x61,0x0,0x2d,0x0,0x33,0x0,0x35,0x0,0x2e,0x0,0x74,0x0,0x78,0x0,0x74,
     // data-2.txt
   0x0,0xa,
   0x4,0x8,0xa,0xb4,
@@ -53,6 +53,11 @@ static const unsigned char qt_resource_name[] = {
   0x4,0xe,0xa,0xb4,
   0x0,0x64,
   0x0,0x61,0x0,0x74,0x0,0x61,0x0,0x2d,0x0,0x30,0x0,0x2e,0x0,0x74,0x0,0x78,0x0,0x74,
+    // data-35.txt
+  0x0,0xb,
+  0x0,0xb5,0x4f,0x74,
+  0x0,0x64,
+  0x0,0x61,0x0,0x74,0x0,0x61,0x0,0x2d,0x0,0x33,0x0,0x35,0x0,0x2e,0x0,0x74,0x0,0x78,0x0,0x74,
   
 };
 
@@ -64,16 +69,16 @@ static const unsigned char qt_resource_struct[] = {
   0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x2,
 0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
   // :/data/data-35.txt
-  0x0,0x0,0x0,0xe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
+  0x0,0x0,0x0,0x5c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0xf,
 TIMESTAMP:data/data-35.txt
   // :/data/data-2.txt
-  0x0,0x0,0x0,0x2a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x27,
+  0x0,0x0,0x0,0xe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
 TIMESTAMP:data/data-2.txt
   // :/data/data-0.txt
-  0x0,0x0,0x0,0x5e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x32,
+  0x0,0x0,0x0,0x42,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0xb,
 TIMESTAMP:data/data-0.txt
   // :/data/data-1.txt
-  0x0,0x0,0x0,0x44,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x2d,
+  0x0,0x0,0x0,0x28,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x6,
 TIMESTAMP:data/data-1.txt
 
 };
@@ -90,7 +95,9 @@ TIMESTAMP:data/data-1.txt
 #   define QT_RCC_MANGLE_NAMESPACE(name) name
 #endif
 
-#ifdef QT_NAMESPACE
+#if defined(QT_INLINE_NAMESPACE)
+inline namespace QT_NAMESPACE {
+#elif defined(QT_NAMESPACE)
 namespace QT_NAMESPACE {
 #endif
 
@@ -119,9 +126,18 @@ int QT_RCC_MANGLE_NAMESPACE(qCleanupResources)()
     return 1;
 }
 
+#ifdef __clang__
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wexit-time-destructors"
+#endif
+
 namespace {
    struct initializer {
        initializer() { QT_RCC_MANGLE_NAMESPACE(qInitResources)(); }
        ~initializer() { QT_RCC_MANGLE_NAMESPACE(qCleanupResources)(); }
    } dummy;
 }
+
+#ifdef __clang__
+#   pragma clang diagnostic pop
+#endif