Fix autotests after the QHash changes
Some test cases are sensitive to the exact ordering inside QHash, and need adjustments when we change QHash or the hashing functions. Some rcc tests now also need 32bit specific data, as the hashing functions for 32 and 64 bit are different now (as we use size_t). Change-Id: Ieab01cd55b1288336493b13c41d27e42a008bdd9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Lars Knoll
parent
8a984ab772
commit
56ebc2363d
@ -486,19 +486,19 @@ void tst_QDBusXmlParser::properties_data()
|
||||
prop.type = "s";
|
||||
prop.access = QDBusIntrospection::Property::Read;
|
||||
map << prop;
|
||||
QTest::newRow("one-readable") << "<property name=\"foo\" type=\"s\" access=\"read\"/>" << map;
|
||||
QTest::newRow("one-readable") << "<property access=\"read\" type=\"s\" name=\"foo\" />" << map;
|
||||
|
||||
// one writable signal
|
||||
prop.access = QDBusIntrospection::Property::Write;
|
||||
map.clear();
|
||||
map << prop;
|
||||
QTest::newRow("one-writable") << "<property name=\"foo\" type=\"s\" access=\"write\"/>" << map;
|
||||
QTest::newRow("one-writable") << "<property access=\"write\" type=\"s\" name=\"foo\"/>" << map;
|
||||
|
||||
// one read- & writable signal
|
||||
prop.access = QDBusIntrospection::Property::ReadWrite;
|
||||
map.clear();
|
||||
map << prop;
|
||||
QTest::newRow("one-read-writable") << "<property name=\"foo\" type=\"s\" access=\"readwrite\"/>"
|
||||
QTest::newRow("one-read-writable") << "<property access=\"readwrite\" type=\"s\" name=\"foo\"/>"
|
||||
<< map;
|
||||
|
||||
// two, mixed properties
|
||||
@ -507,13 +507,13 @@ void tst_QDBusXmlParser::properties_data()
|
||||
prop.access = QDBusIntrospection::Property::Read;
|
||||
map << prop;
|
||||
QTest::newRow("two-1") <<
|
||||
"<property name=\"foo\" type=\"s\" access=\"readwrite\"/>"
|
||||
"<property name=\"bar\" type=\"i\" access=\"read\"/>" << map;
|
||||
"<property access=\"readwrite\" type=\"s\" name=\"foo\"/>"
|
||||
"<property access=\"read\" type=\"i\" name=\"bar\"/>" << map;
|
||||
|
||||
// invert the order of the declaration
|
||||
QTest::newRow("two-2") <<
|
||||
"<property name=\"bar\" type=\"i\" access=\"read\"/>"
|
||||
"<property name=\"foo\" type=\"s\" access=\"readwrite\"/>" << map;
|
||||
"<property access=\"read\" type=\"i\" name=\"bar\"/>"
|
||||
"<property access=\"readwrite\" type=\"s\" name=\"foo\"/>" << map;
|
||||
|
||||
// add a third with annotations
|
||||
prop.name = "baz";
|
||||
@ -523,21 +523,21 @@ void tst_QDBusXmlParser::properties_data()
|
||||
prop.annotations.insert("foo.annotation2", "Goodbye, World");
|
||||
map << prop;
|
||||
QTest::newRow("complex") <<
|
||||
"<property name=\"bar\" type=\"i\" access=\"read\"/>"
|
||||
"<property name=\"baz\" type=\"as\" access=\"write\">"
|
||||
"<property access=\"read\" type=\"i\" name=\"bar\"/>"
|
||||
"<property access=\"write\" type=\"as\" name=\"baz\">"
|
||||
"<annotation name=\"foo.annotation\" value=\"Hello, World\" />"
|
||||
"<annotation name=\"foo.annotation2\" value=\"Goodbye, World\" />"
|
||||
"</property>"
|
||||
"<property name=\"foo\" type=\"s\" access=\"readwrite\"/>" << map;
|
||||
"<property access=\"readwrite\" type=\"s\" name=\"foo\"/>" << map;
|
||||
|
||||
// and now change the order
|
||||
QTest::newRow("complex2") <<
|
||||
"<property name=\"baz\" type=\"as\" access=\"write\">"
|
||||
"<property access=\"write\" type=\"as\" name=\"baz\">"
|
||||
"<annotation name=\"foo.annotation2\" value=\"Goodbye, World\" />"
|
||||
"<annotation name=\"foo.annotation\" value=\"Hello, World\" />"
|
||||
"</property>"
|
||||
"<property name=\"bar\" type=\"i\" access=\"read\"/>"
|
||||
"<property name=\"foo\" type=\"s\" access=\"readwrite\"/>" << map;
|
||||
"<property access=\"read\" type=\"i\" name=\"bar\"/>"
|
||||
"<property access=\"readwrite\" type=\"s\" name=\"foo\"/>" << map;
|
||||
}
|
||||
|
||||
void tst_QDBusXmlParser::properties()
|
||||
|
||||
@ -1 +1 @@
|
||||
simple.qrc.cpp: ../images/images/circle.png ../images/images/square.png
|
||||
simple.qrc.cpp: ../images/images/square.png ../images/images/circle.png
|
||||
|
||||
1
tests/auto/tools/rcc/data/depfile/simple.d.expected32
Normal file
1
tests/auto/tools/rcc/data/depfile/simple.d.expected32
Normal file
@ -0,0 +1 @@
|
||||
simple.qrc.cpp: ../images/images/circle.png ../images/images/square.png
|
||||
@ -1,12 +1,21 @@
|
||||
/****************************************************************************
|
||||
** Resource object code
|
||||
**
|
||||
IGNORE: ** Created by: The Resource Compiler for Qt version 5.3.1
|
||||
IGNORE: ** Created by: The Resource Compiler for Qt version 6.0.0
|
||||
**
|
||||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
static const unsigned char qt_resource_data[] = {
|
||||
IGNORE: // /dev/qt5/qtbase/tests/auto/tools/rcc/data/images/images/square.png
|
||||
0x0,0x0,0x0,0x5e,
|
||||
0x89,
|
||||
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
|
||||
0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x1,0x3,0x0,0x0,0x0,0x49,0xb4,0xe8,0xb7,
|
||||
0x0,0x0,0x0,0x6,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x58,0xa8,0xff,0x8c,0x14,
|
||||
0x1f,0xab,0x0,0x0,0x0,0x13,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x0,0x81,
|
||||
0xfa,0xff,0xff,0xff,0xd,0x3e,0x2,0x4,0x0,0x8d,0x4d,0x68,0x6b,0xcf,0xb8,0x8e,
|
||||
0x86,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
|
||||
IGNORE: // /dev/qt5/qtbase/tests/auto/tools/rcc/data/images/images/circle.png
|
||||
0x0,0x0,0x0,0xa5,
|
||||
0x89,
|
||||
@ -21,16 +30,7 @@ IGNORE: // /dev/qt5/qtbase/tests/auto/tools/rcc/data/images/images/circle.png
|
||||
0x4c,0x48,0x31,0x15,0x53,0xec,0x5,0x14,0x9b,0x11,0xc5,0x6e,0x8,0xdd,0x8e,0x1b,
|
||||
0x14,0x54,0x19,0xf3,0xa1,0x23,0xdb,0xd5,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,
|
||||
0xae,0x42,0x60,0x82,
|
||||
IGNORE: // /dev/qt5/qtbase/tests/auto/tools/rcc/data/images/images/square.png
|
||||
0x0,0x0,0x0,0x5e,
|
||||
0x89,
|
||||
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
|
||||
0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x1,0x3,0x0,0x0,0x0,0x49,0xb4,0xe8,0xb7,
|
||||
0x0,0x0,0x0,0x6,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x58,0xa8,0xff,0x8c,0x14,
|
||||
0x1f,0xab,0x0,0x0,0x0,0x13,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x0,0x81,
|
||||
0xfa,0xff,0xff,0xff,0xd,0x3e,0x2,0x4,0x0,0x8d,0x4d,0x68,0x6b,0xcf,0xb8,0x8e,
|
||||
0x86,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
|
||||
IGNORE: // /dev/qt5/qtbase/tests/auto/tools/rcc/data/images/images/subdir/triangle.png
|
||||
IGNORE: // /dev/qt5/qtbase/tests/auto/tools/rcc/data/images/images/subdir/triangle.png
|
||||
0x0,0x0,0x0,0xaa,
|
||||
0x89,
|
||||
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
|
||||
@ -53,21 +53,21 @@ static const unsigned char qt_resource_name[] = {
|
||||
0x7,0x3,0x7d,0xc3,
|
||||
0x0,0x69,
|
||||
0x0,0x6d,0x0,0x61,0x0,0x67,0x0,0x65,0x0,0x73,
|
||||
// subdir
|
||||
0x0,0x6,
|
||||
0x7,0xab,0x8b,0x2,
|
||||
0x0,0x73,
|
||||
0x0,0x75,0x0,0x62,0x0,0x64,0x0,0x69,0x0,0x72,
|
||||
// circle.png
|
||||
0x0,0xa,
|
||||
0xa,0x2d,0x16,0x47,
|
||||
0x0,0x63,
|
||||
0x0,0x69,0x0,0x72,0x0,0x63,0x0,0x6c,0x0,0x65,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67,
|
||||
// square.png
|
||||
0x0,0xa,
|
||||
0x8,0x8b,0x6,0x27,
|
||||
0x0,0x73,
|
||||
0x0,0x71,0x0,0x75,0x0,0x61,0x0,0x72,0x0,0x65,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67,
|
||||
// circle.png
|
||||
0x0,0xa,
|
||||
0xa,0x2d,0x16,0x47,
|
||||
0x0,0x63,
|
||||
0x0,0x69,0x0,0x72,0x0,0x63,0x0,0x6c,0x0,0x65,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67,
|
||||
// subdir
|
||||
0x0,0x6,
|
||||
0x7,0xab,0x8b,0x2,
|
||||
0x0,0x73,
|
||||
0x0,0x75,0x0,0x62,0x0,0x64,0x0,0x69,0x0,0x72,
|
||||
// triangle.png
|
||||
0x0,0xc,
|
||||
0x5,0x59,0xa7,0xc7,
|
||||
@ -84,13 +84,13 @@ static const unsigned char qt_resource_struct[] = {
|
||||
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x2,
|
||||
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
|
||||
// :/images/subdir
|
||||
0x0,0x0,0x0,0x12,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x5,
|
||||
0x0,0x0,0x0,0x46,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x5,
|
||||
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
|
||||
// :/images/square.png
|
||||
0x0,0x0,0x0,0x3e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0xa9,
|
||||
0x0,0x0,0x0,0x12,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
|
||||
TIMESTAMP:images/square.png
|
||||
// :/images/circle.png
|
||||
0x0,0x0,0x0,0x24,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
|
||||
0x0,0x0,0x0,0x2c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x62,
|
||||
TIMESTAMP:images/circle.png
|
||||
// :/images/subdir/triangle.png
|
||||
0x0,0x0,0x0,0x58,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0xb,
|
||||
|
||||
147
tests/auto/tools/rcc/data/images/images.expected32
Normal file
147
tests/auto/tools/rcc/data/images/images.expected32
Normal file
@ -0,0 +1,147 @@
|
||||
/****************************************************************************
|
||||
** Resource object code
|
||||
**
|
||||
IGNORE: ** Created by: The Resource Compiler for Qt version 6.0.0
|
||||
**
|
||||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
static const unsigned char qt_resource_data[] = {
|
||||
IGNORE: // /dev/qt5/qtbase/tests/auto/tools/rcc/data/images/images/circle.png
|
||||
0x0,0x0,0x0,0xa5,
|
||||
0x89,
|
||||
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
|
||||
0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0x73,0x7a,0x7a,0xf4,
|
||||
0x0,0x0,0x0,0x6c,0x49,0x44,0x41,0x54,0x58,0xc3,0xed,0xd7,0x5b,0xe,0x0,0x10,
|
||||
0xc,0x44,0x51,0xcb,0xb4,0x44,0xbb,0x64,0x3,0x1e,0xd5,0x18,0x1d,0x31,0x12,0xdf,
|
||||
0xf7,0x7c,0xd1,0xa6,0xf4,0xe8,0xa9,0x93,0x8b,0x8f,0xe6,0x52,0x87,0x17,0x81,0x59,
|
||||
0x46,0xd,0x18,0x7f,0xdc,0x13,0x1e,0x40,0x62,0xe2,0x5e,0xc4,0xd1,0xf8,0x2e,0x2,
|
||||
0x12,0xb7,0x22,0xa0,0x71,0xb,0x22,0x14,0x70,0x25,0x3e,0x43,0xfc,0xd,0xb8,0x1a,
|
||||
0xef,0x21,0x4,0x10,0x40,0x0,0x3d,0x44,0x14,0x0,0x7d,0xc7,0x14,0x13,0x11,0xc5,
|
||||
0x4c,0x48,0x31,0x15,0x53,0xec,0x5,0x14,0x9b,0x11,0xc5,0x6e,0x8,0xdd,0x8e,0x1b,
|
||||
0x14,0x54,0x19,0xf3,0xa1,0x23,0xdb,0xd5,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,
|
||||
0xae,0x42,0x60,0x82,
|
||||
IGNORE: // /dev/qt5/qtbase/tests/auto/tools/rcc/data/images/images/square.png
|
||||
0x0,0x0,0x0,0x5e,
|
||||
0x89,
|
||||
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
|
||||
0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x1,0x3,0x0,0x0,0x0,0x49,0xb4,0xe8,0xb7,
|
||||
0x0,0x0,0x0,0x6,0x50,0x4c,0x54,0x45,0x0,0x0,0x0,0x58,0xa8,0xff,0x8c,0x14,
|
||||
0x1f,0xab,0x0,0x0,0x0,0x13,0x49,0x44,0x41,0x54,0x8,0xd7,0x63,0x60,0x0,0x81,
|
||||
0xfa,0xff,0xff,0xff,0xd,0x3e,0x2,0x4,0x0,0x8d,0x4d,0x68,0x6b,0xcf,0xb8,0x8e,
|
||||
0x86,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
|
||||
IGNORE: // /dev/qt5/qtbase/tests/auto/tools/rcc/data/images/images/subdir/triangle.png
|
||||
0x0,0x0,0x0,0xaa,
|
||||
0x89,
|
||||
0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
|
||||
0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0x73,0x7a,0x7a,0xf4,
|
||||
0x0,0x0,0x0,0x71,0x49,0x44,0x41,0x54,0x58,0xc3,0xed,0xce,0x4b,0xa,0x80,0x30,
|
||||
0x10,0x4,0xd1,0x1c,0xd3,0x23,0x7a,0xcb,0x11,0x82,0xb8,0x50,0x62,0x92,0xf9,0xd5,
|
||||
0x66,0x1a,0x7a,0x5d,0xaf,0xb5,0x5a,0xcd,0x36,0xb9,0xcf,0xc4,0x8f,0x53,0xfa,0x9,
|
||||
0xc4,0x13,0xa7,0x10,0x28,0xe0,0x13,0xcf,0x44,0xc,0xe3,0x59,0x8,0x14,0x30,0x8d,
|
||||
0x47,0x23,0x50,0xc0,0x72,0x3c,0x2,0xb1,0x1d,0xf7,0x46,0xa0,0x0,0x75,0xdc,0x3,
|
||||
0x61,0x8e,0x5b,0x11,0x28,0xc0,0x2d,0xae,0x45,0xa0,0x0,0xf7,0xf8,0xe,0x22,0x2c,
|
||||
0xbe,0x8a,0x40,0x1,0xe1,0xf1,0x3f,0x44,0x5a,0x7c,0x84,0x40,0x1,0xe9,0xf1,0x37,
|
||||
0x42,0xe0,0xd7,0xd8,0x5d,0xf,0x6f,0x97,0x11,0x88,0x38,0xa9,0x1e,0x0,0x0,0x0,
|
||||
0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
|
||||
|
||||
};
|
||||
|
||||
static const unsigned char qt_resource_name[] = {
|
||||
// images
|
||||
0x0,0x6,
|
||||
0x7,0x3,0x7d,0xc3,
|
||||
0x0,0x69,
|
||||
0x0,0x6d,0x0,0x61,0x0,0x67,0x0,0x65,0x0,0x73,
|
||||
// circle.png
|
||||
0x0,0xa,
|
||||
0xa,0x2d,0x16,0x47,
|
||||
0x0,0x63,
|
||||
0x0,0x69,0x0,0x72,0x0,0x63,0x0,0x6c,0x0,0x65,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67,
|
||||
// square.png
|
||||
0x0,0xa,
|
||||
0x8,0x8b,0x6,0x27,
|
||||
0x0,0x73,
|
||||
0x0,0x71,0x0,0x75,0x0,0x61,0x0,0x72,0x0,0x65,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67,
|
||||
// subdir
|
||||
0x0,0x6,
|
||||
0x7,0xab,0x8b,0x2,
|
||||
0x0,0x73,
|
||||
0x0,0x75,0x0,0x62,0x0,0x64,0x0,0x69,0x0,0x72,
|
||||
// triangle.png
|
||||
0x0,0xc,
|
||||
0x5,0x59,0xa7,0xc7,
|
||||
0x0,0x74,
|
||||
0x0,0x72,0x0,0x69,0x0,0x61,0x0,0x6e,0x0,0x67,0x0,0x6c,0x0,0x65,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67,
|
||||
|
||||
};
|
||||
|
||||
static const unsigned char qt_resource_struct[] = {
|
||||
// :
|
||||
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,
|
||||
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
|
||||
// :/images
|
||||
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x3,0x0,0x0,0x0,0x2,
|
||||
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
|
||||
// :/images/subdir
|
||||
0x0,0x0,0x0,0x46,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x5,
|
||||
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
|
||||
// :/images/square.png
|
||||
0x0,0x0,0x0,0x2c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0xa9,
|
||||
TIMESTAMP:images/square.png
|
||||
// :/images/circle.png
|
||||
0x0,0x0,0x0,0x12,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
|
||||
TIMESTAMP:images/circle.png
|
||||
// :/images/subdir/triangle.png
|
||||
0x0,0x0,0x0,0x58,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x1,0xb,
|
||||
TIMESTAMP:images/subdir/triangle.png
|
||||
|
||||
};
|
||||
|
||||
#ifdef QT_NAMESPACE
|
||||
# define QT_RCC_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name
|
||||
# define QT_RCC_MANGLE_NAMESPACE0(x) x
|
||||
# define QT_RCC_MANGLE_NAMESPACE1(a, b) a##_##b
|
||||
# define QT_RCC_MANGLE_NAMESPACE2(a, b) QT_RCC_MANGLE_NAMESPACE1(a,b)
|
||||
# define QT_RCC_MANGLE_NAMESPACE(name) QT_RCC_MANGLE_NAMESPACE2( \
|
||||
QT_RCC_MANGLE_NAMESPACE0(name), QT_RCC_MANGLE_NAMESPACE0(QT_NAMESPACE))
|
||||
#else
|
||||
# define QT_RCC_PREPEND_NAMESPACE(name) name
|
||||
# define QT_RCC_MANGLE_NAMESPACE(name) name
|
||||
#endif
|
||||
|
||||
#ifdef QT_NAMESPACE
|
||||
namespace QT_NAMESPACE {
|
||||
#endif
|
||||
|
||||
bool qRegisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *);
|
||||
bool qUnregisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *);
|
||||
|
||||
#ifdef QT_NAMESPACE
|
||||
}
|
||||
#endif
|
||||
|
||||
int QT_RCC_MANGLE_NAMESPACE(qInitResources)();
|
||||
int QT_RCC_MANGLE_NAMESPACE(qInitResources)()
|
||||
{
|
||||
int version = 3;
|
||||
QT_RCC_PREPEND_NAMESPACE(qRegisterResourceData)
|
||||
(version, qt_resource_struct, qt_resource_name, qt_resource_data);
|
||||
return 1;
|
||||
}
|
||||
|
||||
int QT_RCC_MANGLE_NAMESPACE(qCleanupResources)();
|
||||
int QT_RCC_MANGLE_NAMESPACE(qCleanupResources)()
|
||||
{
|
||||
int version = 3;
|
||||
QT_RCC_PREPEND_NAMESPACE(qUnregisterResourceData)
|
||||
(version, qt_resource_struct, qt_resource_name, qt_resource_data);
|
||||
return 1;
|
||||
}
|
||||
|
||||
namespace {
|
||||
struct initializer {
|
||||
initializer() { QT_RCC_MANGLE_NAMESPACE(qInitResources)(); }
|
||||
~initializer() { QT_RCC_MANGLE_NAMESPACE(qCleanupResources)(); }
|
||||
} dummy;
|
||||
}
|
||||
@ -1,27 +1,27 @@
|
||||
/****************************************************************************
|
||||
** Resource object code
|
||||
**
|
||||
IGNORE: ** Created by: The Resource Compiler for Qt version 5.11.2
|
||||
IGNORE: ** Created by: The Resource Compiler for Qt version 6.0.0
|
||||
**
|
||||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
static const unsigned char qt_resource_data[] = {
|
||||
IGNORE: // /data/dev/qt-5/qtbase/tests/auto/tools/rcc/data/sizes/data/data-2.txt
|
||||
0x0,0x0,0x0,0x2,
|
||||
0x30,
|
||||
0x31,
|
||||
IGNORE: // /data/dev/qt-5/qtbase/tests/auto/tools/rcc/data/sizes/data/data-35.txt
|
||||
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: // /data/dev/qt-5/qtbase/tests/auto/tools/rcc/data/sizes/data/data-1.txt
|
||||
IGNORE: // /dev/qt5/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
|
||||
0x0,0x0,0x0,0x1,
|
||||
0x40,
|
||||
|
||||
IGNORE: // /data/dev/qt-5/qtbase/tests/auto/tools/rcc/data/sizes/data/data-0.txt
|
||||
IGNORE: // /dev/qt5/qtbase/tests/auto/tools/rcc/data/sizes/data/data-0.txt
|
||||
0x0,0x0,0x0,0x0,
|
||||
|
||||
|
||||
@ -33,16 +33,16 @@ static const unsigned char qt_resource_name[] = {
|
||||
0x0,0x6,0xa8,0xa1,
|
||||
0x0,0x64,
|
||||
0x0,0x61,0x0,0x74,0x0,0x61,
|
||||
// data-2.txt
|
||||
0x0,0xa,
|
||||
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-2.txt
|
||||
0x0,0xa,
|
||||
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-1.txt
|
||||
0x0,0xa,
|
||||
0x4,0x11,0xa,0xb4,
|
||||
@ -64,10 +64,10 @@ 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,0x28,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x6,
|
||||
0x0,0x0,0x0,0xe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
|
||||
TIMESTAMP:data/data-35.txt
|
||||
// :/data/data-2.txt
|
||||
0x0,0x0,0x0,0xe,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
|
||||
0x0,0x0,0x0,0x2a,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x27,
|
||||
TIMESTAMP:data/data-2.txt
|
||||
// :/data/data-0.txt
|
||||
0x0,0x0,0x0,0x5e,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x32,
|
||||
|
||||
127
tests/auto/tools/rcc/data/sizes/size-2-0-35-1.expected32
Normal file
127
tests/auto/tools/rcc/data/sizes/size-2-0-35-1.expected32
Normal file
@ -0,0 +1,127 @@
|
||||
/****************************************************************************
|
||||
** Resource object code
|
||||
**
|
||||
IGNORE: ** Created by: The Resource Compiler for Qt version 6.0.0
|
||||
**
|
||||
** WARNING! All changes made in this file will be lost!
|
||||
*****************************************************************************/
|
||||
|
||||
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
|
||||
0x0,0x0,0x0,0x1,
|
||||
0x40,
|
||||
|
||||
IGNORE: // /dev/qt5/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
|
||||
0x0,0x0,0x0,0x0,
|
||||
|
||||
|
||||
};
|
||||
|
||||
static const unsigned char qt_resource_name[] = {
|
||||
// data
|
||||
0x0,0x4,
|
||||
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,
|
||||
0x0,0x64,
|
||||
0x0,0x61,0x0,0x74,0x0,0x61,0x0,0x2d,0x0,0x31,0x0,0x2e,0x0,0x74,0x0,0x78,0x0,0x74,
|
||||
// data-2.txt
|
||||
0x0,0xa,
|
||||
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-0.txt
|
||||
0x0,0xa,
|
||||
0x4,0xe,0xa,0xb4,
|
||||
0x0,0x64,
|
||||
0x0,0x61,0x0,0x74,0x0,0x61,0x0,0x2d,0x0,0x30,0x0,0x2e,0x0,0x74,0x0,0x78,0x0,0x74,
|
||||
|
||||
};
|
||||
|
||||
static const unsigned char qt_resource_struct[] = {
|
||||
// :
|
||||
0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,
|
||||
0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,
|
||||
// :/data
|
||||
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,
|
||||
TIMESTAMP:data/data-35.txt
|
||||
// :/data/data-2.txt
|
||||
0x0,0x0,0x0,0x44,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x2c,
|
||||
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,
|
||||
TIMESTAMP:data/data-1.txt
|
||||
|
||||
};
|
||||
|
||||
#ifdef QT_NAMESPACE
|
||||
# define QT_RCC_PREPEND_NAMESPACE(name) ::QT_NAMESPACE::name
|
||||
# define QT_RCC_MANGLE_NAMESPACE0(x) x
|
||||
# define QT_RCC_MANGLE_NAMESPACE1(a, b) a##_##b
|
||||
# define QT_RCC_MANGLE_NAMESPACE2(a, b) QT_RCC_MANGLE_NAMESPACE1(a,b)
|
||||
# define QT_RCC_MANGLE_NAMESPACE(name) QT_RCC_MANGLE_NAMESPACE2( \
|
||||
QT_RCC_MANGLE_NAMESPACE0(name), QT_RCC_MANGLE_NAMESPACE0(QT_NAMESPACE))
|
||||
#else
|
||||
# define QT_RCC_PREPEND_NAMESPACE(name) name
|
||||
# define QT_RCC_MANGLE_NAMESPACE(name) name
|
||||
#endif
|
||||
|
||||
#ifdef QT_NAMESPACE
|
||||
namespace QT_NAMESPACE {
|
||||
#endif
|
||||
|
||||
bool qRegisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *);
|
||||
bool qUnregisterResourceData(int, const unsigned char *, const unsigned char *, const unsigned char *);
|
||||
|
||||
#ifdef QT_NAMESPACE
|
||||
}
|
||||
#endif
|
||||
|
||||
int QT_RCC_MANGLE_NAMESPACE(qInitResources)();
|
||||
int QT_RCC_MANGLE_NAMESPACE(qInitResources)()
|
||||
{
|
||||
int version = 3;
|
||||
QT_RCC_PREPEND_NAMESPACE(qRegisterResourceData)
|
||||
(version, qt_resource_struct, qt_resource_name, qt_resource_data);
|
||||
return 1;
|
||||
}
|
||||
|
||||
int QT_RCC_MANGLE_NAMESPACE(qCleanupResources)();
|
||||
int QT_RCC_MANGLE_NAMESPACE(qCleanupResources)()
|
||||
{
|
||||
int version = 3;
|
||||
QT_RCC_PREPEND_NAMESPACE(qUnregisterResourceData)
|
||||
(version, qt_resource_struct, qt_resource_name, qt_resource_data);
|
||||
return 1;
|
||||
}
|
||||
|
||||
namespace {
|
||||
struct initializer {
|
||||
initializer() { QT_RCC_MANGLE_NAMESPACE(qInitResources)(); }
|
||||
~initializer() { QT_RCC_MANGLE_NAMESPACE(qCleanupResources)(); }
|
||||
} dummy;
|
||||
}
|
||||
@ -1,19 +1,19 @@
|
||||
# Resource object code (Python 3)
|
||||
# Created by: object code
|
||||
# Created by: The Resource Compiler for Qt version 5.14.0
|
||||
# Created by: The Resource Compiler for Qt version 6.0.0
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
|
||||
from PySide2 import QtCore
|
||||
|
||||
qt_resource_data = b"\
|
||||
\x00\x00\x00\x02\
|
||||
0\
|
||||
1\
|
||||
\x00\x00\x00#\
|
||||
0\
|
||||
123456789 012345\
|
||||
6789 0123456789 \
|
||||
12\
|
||||
\x00\x00\x00\x02\
|
||||
0\
|
||||
1\
|
||||
\x00\x00\x00\x01\
|
||||
@\
|
||||
\
|
||||
@ -26,15 +26,15 @@ qt_resource_name = b"\
|
||||
\x00\x06\xa8\xa1\
|
||||
\x00d\
|
||||
\x00a\x00t\x00a\
|
||||
\x00\x0a\
|
||||
\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\x08\x0a\xb4\
|
||||
\x00d\
|
||||
\x00a\x00t\x00a\x00-\x002\x00.\x00t\x00x\x00t\
|
||||
\x00\x0a\
|
||||
\x04\x11\x0a\xb4\
|
||||
\x00d\
|
||||
\x00a\x00t\x00a\x00-\x001\x00.\x00t\x00x\x00t\
|
||||
@ -49,10 +49,10 @@ 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(\x00\x00\x00\x00\x00\x01\x00\x00\x00\x06\
|
||||
IGNORE: (time stamp)
|
||||
\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\x00'\
|
||||
IGNORE: (time stamp)
|
||||
\x00\x00\x00^\x00\x00\x00\x00\x00\x01\x00\x00\x002\
|
||||
IGNORE: (time stamp)
|
||||
\x00\x00\x00D\x00\x00\x00\x00\x00\x01\x00\x00\x00-\
|
||||
|
||||
@ -0,0 +1,68 @@
|
||||
# Resource object code (Python 3)
|
||||
# Created by: object code
|
||||
# Created by: The Resource Compiler for Qt version 6.0.0
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
|
||||
from PySide2 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\x00\
|
||||
\
|
||||
"
|
||||
|
||||
qt_resource_name = b"\
|
||||
\x00\x04\
|
||||
\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\
|
||||
\x00a\x00t\x00a\x00-\x001\x00.\x00t\x00x\x00t\
|
||||
\x00\x0a\
|
||||
\x04\x08\x0a\xb4\
|
||||
\x00d\
|
||||
\x00a\x00t\x00a\x00-\x002\x00.\x00t\x00x\x00t\
|
||||
\x00\x0a\
|
||||
\x04\x0e\x0a\xb4\
|
||||
\x00d\
|
||||
\x00a\x00t\x00a\x00-\x000\x00.\x00t\x00x\x00t\
|
||||
"
|
||||
|
||||
qt_resource_struct = b"\
|
||||
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
|
||||
\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\
|
||||
IGNORE: (time stamp)
|
||||
\x00\x00\x00D\x00\x00\x00\x00\x00\x01\x00\x00\x00,\
|
||||
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'\
|
||||
IGNORE: (time stamp)
|
||||
"
|
||||
|
||||
def qInitResources():
|
||||
QtCore.qRegisterResourceData(0x03, qt_resource_struct, qt_resource_name, qt_resource_data)
|
||||
|
||||
def qCleanupResources():
|
||||
QtCore.qUnregisterResourceData(0x03, qt_resource_struct, qt_resource_name, qt_resource_data)
|
||||
|
||||
qInitResources()
|
||||
@ -167,12 +167,14 @@ void tst_rcc::rcc_data()
|
||||
QTest::addColumn<QString>("expected");
|
||||
|
||||
const QString imagesPath = m_dataPath + QLatin1String("/images");
|
||||
QTest::newRow("images") << imagesPath << "images.qrc" << "images.expected";
|
||||
QTest::newRow("images") << imagesPath << "images.qrc" <<
|
||||
(sizeof(size_t) == 8 ? "images.expected" : "images.expected32");
|
||||
|
||||
const QString sizesPath = m_dataPath + QLatin1String("/sizes");
|
||||
QTest::newRow("size-0") << sizesPath << "size-0.qrc" << "size-0.expected";
|
||||
QTest::newRow("size-1") << sizesPath << "size-1.qrc" << "size-1.expected";
|
||||
QTest::newRow("size-2-0-35-1") << sizesPath << "size-2-0-35-1.qrc" << "size-2-0-35-1.expected";
|
||||
QTest::newRow("size-2-0-35-1") << sizesPath << "size-2-0-35-1.qrc" <<
|
||||
(sizeof(size_t) == 8 ? "size-2-0-35-1.expected" : "size-2-0-35-1.expected32");
|
||||
}
|
||||
|
||||
static QStringList readLinesFromFile(const QString &fileName,
|
||||
@ -425,7 +427,8 @@ void tst_rcc::depFileGeneration_data()
|
||||
QTest::addColumn<QString>("depfile");
|
||||
QTest::addColumn<QString>("expected");
|
||||
|
||||
QTest::newRow("simple") << "simple.qrc" << "simple.d" << "simple.d.expected";
|
||||
QTest::newRow("simple") << "simple.qrc" << "simple.d"
|
||||
<< (sizeof(size_t) == 8 ? "simple.d.expected" : "simple.d.expected32");
|
||||
QTest::newRow("specialchar") << "specialchar.qrc" << "specialchar.d" << "specialchar.d.expected";
|
||||
}
|
||||
|
||||
@ -467,7 +470,9 @@ void tst_rcc::python()
|
||||
const QString path = m_dataPath + QLatin1String("/sizes");
|
||||
const QString testFileRoot = path + QLatin1String("/size-2-0-35-1");
|
||||
const QString qrcFile = testFileRoot + QLatin1String(".qrc");
|
||||
const QString expectedFile = testFileRoot + QLatin1String("_python.expected");
|
||||
QString expectedFile = testFileRoot + QLatin1String("_python.expected");
|
||||
if (sizeof(size_t) == 4)
|
||||
expectedFile += QLatin1String("32");
|
||||
const QString actualFile = testFileRoot + QLatin1String(".rcc");
|
||||
|
||||
QProcess process;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user