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

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

1 files changed, 3 insertions, 3 deletions

diff --git a/tests/auto/toolsupport/tst_toolsupport.cpp b/tests/auto/toolsupport/tst_toolsupport.cpp
index f743a6f5c6..0c87d1a00c 100644
--- a/tests/auto/toolsupport/tst_toolsupport.cpp
+++ b/tests/auto/toolsupport/tst_toolsupport.cpp
@@ -87,7 +87,7 @@ void tst_toolsupport::offsets_data()
     {
         QTestData &data = QTest::newRow("sizeof(QObjectData)")
                 << sizeof(QObjectData);
-        data << 28 << 48; // vptr + 3 ptr + 2 int + ptr
+        data << 36 << 64; // vptr + 4 ptr + 3 int + (padding) + ptr
     }
 
     {
@@ -115,8 +115,8 @@ void tst_toolsupport::offsets_data()
 
     {
         QTestData &data
-            = QTest::newRow("Heap::String::text")
-            << pmm_to_offsetof(&QV4::Heap::String::text);
+            = QTest::newRow("Heap::String::textStorage")
+            << pmm_to_offsetof(&QV4::Heap::String::textStorage);
 
         data << 4 << 8;
     }