merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend

Conflicts:
	tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp
	tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp

1 files changed, 5 insertions, 2 deletions

diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
index ee3e8cd2eb..fd1c07103f 100644
--- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
+++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
@@ -262,6 +262,8 @@ tst_Suite::tst_Suite()
     addExpectedFailure("string-split", "4", "3", willFixInNextReleaseMessage);
     addExpectedFailure("substr", "abcdefghijklmn", "", willFixInNextReleaseMessage);
 
+    static const char klass[] = "tst_QScriptV8TestSuite";
+
     QVector<uint> *data = qt_meta_data_tst_Suite();
     // content:
     *data << 1 // revision
@@ -273,7 +275,7 @@ tst_Suite::tst_Suite()
         ;
 
     QVector<char> *stringdata = qt_meta_stringdata_tst_Suite();
-    appendCString(stringdata, "tst_Suite");
+    appendCString(stringdata, klass);
     appendCString(stringdata, "");
 
     QFileInfoList testFileInfos;
@@ -283,7 +285,8 @@ tst_Suite::tst_Suite()
         QString name = tfi.baseName();
         // slot: signature, parameters, type, tag, flags
         QString slot = QString::fromLatin1("%0()").arg(name);
-        *data << stringdata->size() << 10 << 10 << 10 << 0x08;
+        static const int nullbyte = sizeof(klass);
+        *data << stringdata->size() << nullbyte << nullbyte << nullbyte << 0x08;
         appendCString(stringdata, slot.toLatin1());
         testNames.append(name);
     }