summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools/rcc/data/sizes
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/tools/rcc/data/sizes')
-rw-r--r--tests/auto/tools/rcc/data/sizes/size-0.expected18
-rw-r--r--tests/auto/tools/rcc/data/sizes/size-1.expected18
-rw-r--r--tests/auto/tools/rcc/data/sizes/size-2-0-35-1.expected56
-rw-r--r--tests/auto/tools/rcc/data/sizes/size-2-0-35-1.expected3245
-rw-r--r--tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected28
-rw-r--r--tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected3226
6 files changed, 123 insertions, 68 deletions
diff --git a/tests/auto/tools/rcc/data/sizes/size-0.expected b/tests/auto/tools/rcc/data/sizes/size-0.expected
index 2f70a607ab..79defe7868 100644
--- a/tests/auto/tools/rcc/data/sizes/size-0.expected
+++ b/tests/auto/tools/rcc/data/sizes/size-0.expected
@@ -6,6 +6,11 @@ IGNORE: ** Created by: The Resource Compiler for Qt version 5.11.2
** 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: // /data/dev/qt-5/qtbase/tests/auto/tools/rcc/data/sizes/data/data-0.txt
0x0,0x0,0x0,0x0,
@@ -52,7 +57,9 @@ TIMESTAMP:data/data-0.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
@@ -81,9 +88,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
diff --git a/tests/auto/tools/rcc/data/sizes/size-1.expected b/tests/auto/tools/rcc/data/sizes/size-1.expected
index d1717a9255..925de99c32 100644
--- a/tests/auto/tools/rcc/data/sizes/size-1.expected
+++ b/tests/auto/tools/rcc/data/sizes/size-1.expected
@@ -6,6 +6,11 @@ IGNORE:** Created by: The Resource Compiler for Qt version 5.11.2
** 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: // /data/dev/qt-5/qtbase/tests/auto/tools/rcc/data/sizes/data/data-1.txt
0x0,0x0,0x0,0x1,
@@ -53,7 +58,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
@@ -82,9 +89,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
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
diff --git a/tests/auto/tools/rcc/data/sizes/size-2-0-35-1.expected32 b/tests/auto/tools/rcc/data/sizes/size-2-0-35-1.expected32
index 3b5f643986..a67e0ffc6e 100644
--- a/tests/auto/tools/rcc/data/sizes/size-2-0-35-1.expected32
+++ b/tests/auto/tools/rcc/data/sizes/size-2-0-35-1.expected32
@@ -1,27 +1,32 @@
/****************************************************************************
** 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-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-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-0.txt
+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,
+IGNORE: // D:/projects/qt/dev/src/qtbase/tests/auto/tools/rcc/data/sizes/data/data-0.txt
0x0,0x0,0x0,0x0,
@@ -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-1.txt
0x0,0xa,
0x4,0x11,0xa,0xb4,
@@ -48,6 +48,11 @@ static const unsigned char qt_resource_name[] = {
0x4,0x8,0xa,0xb4,
0x0,0x64,
0x0,0x61,0x0,0x74,0x0,0x61,0x0,0x2d,0x0,0x32,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,
// data-0.txt
0x0,0xa,
0x4,0xe,0xa,0xb4,
@@ -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,0x42,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0xb,
TIMESTAMP:data/data-35.txt
// :/data/data-2.txt
- 0x0,0x0,0x0,0x44,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x2c,
+ 0x0,0x0,0x0,0x28,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x5,
TIMESTAMP:data/data-2.txt
// :/data/data-0.txt
0x0,0x0,0x0,0x5e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x32,
TIMESTAMP:data/data-0.txt
// :/data/data-1.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-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
diff --git a/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected b/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected
index 366cd20e33..849e91c012 100644
--- a/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected
+++ b/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected
@@ -1,16 +1,11 @@
# Resource object code (Python 3)
# Created by: object code
-# Created by: The Resource Compiler for Qt version 6.0.0
+# Created by: The Resource Compiler for Qt version 6.3.0
# WARNING! All changes made in this file will be lost!
from PySide6 import QtCore
qt_resource_data = b"\
-\x00\x00\x00#\
-0\
-123456789 012345\
-6789 0123456789 \
-12\
\x00\x00\x00\x02\
0\
1\
@@ -19,6 +14,11 @@ qt_resource_data = b"\
\
\x00\x00\x00\x00\
\
+\x00\x00\x00#\
+0\
+123456789 012345\
+6789 0123456789 \
+12\
"
qt_resource_name = b"\
@@ -26,10 +26,6 @@ qt_resource_name = b"\
\x00\x06\xa8\xa1\
\x00d\
\x00a\x00t\x00a\
-\x00\x0b\
-\x00\xb5Ot\
-\x00d\
-\x00a\x00t\x00a\x00-\x003\x005\x00.\x00t\x00x\x00t\
\x00\x0a\
\x04\x08\x0a\xb4\
\x00d\
@@ -42,6 +38,10 @@ qt_resource_name = b"\
\x04\x0e\x0a\xb4\
\x00d\
\x00a\x00t\x00a\x00-\x000\x00.\x00t\x00x\x00t\
+\x00\x0b\
+\x00\xb5Ot\
+\x00d\
+\x00a\x00t\x00a\x00-\x003\x005\x00.\x00t\x00x\x00t\
"
qt_resource_struct = b"\
@@ -49,13 +49,13 @@ qt_resource_struct = b"\
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x02\
\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
+\x00\x00\x00\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x00\x0f\
IGNORE: (time stamp)
-\x00\x00\x00*\x00\x00\x00\x00\x00\x01\x00\x00\x00'\
+\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
IGNORE: (time stamp)
-\x00\x00\x00^\x00\x00\x00\x00\x00\x01\x00\x00\x002\
+\x00\x00\x00B\x00\x00\x00\x00\x00\x01\x00\x00\x00\x0b\
IGNORE: (time stamp)
-\x00\x00\x00D\x00\x00\x00\x00\x00\x01\x00\x00\x00-\
+\x00\x00\x00(\x00\x00\x00\x00\x00\x01\x00\x00\x00\x06\
IGNORE: (time stamp)
"
diff --git a/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected32 b/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected32
index 1d47fa5d30..0fa118d24f 100644
--- a/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected32
+++ b/tests/auto/tools/rcc/data/sizes/size-2-0-35-1_python.expected32
@@ -1,22 +1,22 @@
# Resource object code (Python 3)
# Created by: object code
-# Created by: The Resource Compiler for Qt version 6.0.0
+# Created by: The Resource Compiler for Qt version 6.3.0
# WARNING! All changes made in this file will be lost!
from PySide6 import QtCore
qt_resource_data = b"\
-\x00\x00\x00#\
-0\
-123456789 012345\
-6789 0123456789 \
-12\
\x00\x00\x00\x01\
@\
\
\x00\x00\x00\x02\
0\
1\
+\x00\x00\x00#\
+0\
+123456789 012345\
+6789 0123456789 \
+12\
\x00\x00\x00\x00\
\
"
@@ -26,10 +26,6 @@ qt_resource_name = b"\
\x00\x06\xa8\xa1\
\x00d\
\x00a\x00t\x00a\
-\x00\x0b\
-\x00\xb5Ot\
-\x00d\
-\x00a\x00t\x00a\x00-\x003\x005\x00.\x00t\x00x\x00t\
\x00\x0a\
\x04\x11\x0a\xb4\
\x00d\
@@ -38,6 +34,10 @@ qt_resource_name = b"\
\x04\x08\x0a\xb4\
\x00d\
\x00a\x00t\x00a\x00-\x002\x00.\x00t\x00x\x00t\
+\x00\x0b\
+\x00\xb5Ot\
+\x00d\
+\x00a\x00t\x00a\x00-\x003\x005\x00.\x00t\x00x\x00t\
\x00\x0a\
\x04\x0e\x0a\xb4\
\x00d\
@@ -49,13 +49,13 @@ qt_resource_struct = b"\
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x02\
\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
+\x00\x00\x00B\x00\x00\x00\x00\x00\x01\x00\x00\x00\x0b\
IGNORE: (time stamp)
-\x00\x00\x00D\x00\x00\x00\x00\x00\x01\x00\x00\x00,\
+\x00\x00\x00(\x00\x00\x00\x00\x00\x01\x00\x00\x00\x05\
IGNORE: (time stamp)
\x00\x00\x00^\x00\x00\x00\x00\x00\x01\x00\x00\x002\
IGNORE: (time stamp)
-\x00\x00\x00*\x00\x00\x00\x00\x00\x01\x00\x00\x00'\
+\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
IGNORE: (time stamp)
"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 23:55:01 +0000