Add more test entries for built-in JS types

In particular the "wrapper" types (Boolean, Number, String) were
not tested at all.

Reviewed-by: Jedrzej Nowacki

6 files changed, 822 insertions, 161 deletions

diff --git a/tests/auto/qscriptvaluegenerated/testgen/data.txt b/tests/auto/qscriptvaluegenerated/testgen/data.txt
index cebe1d2a59..2cc1229b3f 100644
--- a/tests/auto/qscriptvaluegenerated/testgen/data.txt
+++ b/tests/auto/qscriptvaluegenerated/testgen/data.txt
@@ -116,6 +116,11 @@ engine->evaluate("/foo/")
 engine->evaluate("new Object()")
 engine->evaluate("new Array()")
 engine->evaluate("new Error()")
+engine->evaluate("new Boolean(true)")
+engine->evaluate("new Boolean(false)")
+engine->evaluate("new Number(123)")
+engine->evaluate("new RegExp('foo', 'gim')")
+engine->evaluate("new String('ciao')")
 engine->evaluate("a = new Object(); a.foo = 22; a.foo")
 engine->evaluate("Undefined")
 engine->evaluate("Null")
@@ -154,6 +159,7 @@ engine->newArray()
 engine->newArray(10)
 engine->newDate(QDateTime())
 engine->newQMetaObject(&QObject::staticMetaObject)
+engine->newRegExp("foo", "gim")
 engine->newVariant(QVariant())
 engine->newVariant(QVariant(123))
 engine->newVariant(QVariant(false))
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp
index b12dd29fe9..2353116269 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp
@@ -157,6 +157,11 @@ static QString qscriptvalue_castQString_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -191,6 +196,7 @@ static QString qscriptvalue_castQString_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -248,32 +254,35 @@ static QString qscriptvalue_castQString_valueArray[] = {
     "function () { return 1; }", "function () { return 'ciao'; }",
     "function () { throw new Error('foo'); }", "/foo/",
     "[object Object]", "",
-    "Error: Unknown error", "22",
-    "ReferenceError: Can't find variable: Undefined", "ReferenceError: Can't find variable: Null",
-    "ReferenceError: Can't find variable: True", "ReferenceError: Can't find variable: False",
-    "", "",
-    "true", "false",
-    "122", "124",
-    "0", "0",
-    "123", "6.37e-8",
-    "-6.37e-8", "1126240820",
-    "65536", "65537",
-    "NaN", "Infinity",
-    "-Infinity", "ciao",
-    "", "0",
-    "123", "12.4",
-    "", "",
-    "[object Object]", "",
-    ",,,,,,,,,", "Invalid Date",
-    "[object QMetaObject]", "undefined",
+    "Error: Unknown error", "true",
+    "false", "123",
+    "/foo/gim", "ciao",
+    "22", "ReferenceError: Can't find variable: Undefined",
+    "ReferenceError: Can't find variable: Null", "ReferenceError: Can't find variable: True",
+    "ReferenceError: Can't find variable: False", "",
+    "", "true",
+    "false", "122",
+    "124", "0",
+    "0", "123",
+    "6.37e-8", "-6.37e-8",
+    "1126240820", "65536",
+    "65537", "NaN",
+    "Infinity", "-Infinity",
+    "ciao", "",
+    "0", "123",
+    "12.4", "",
+    "", "[object Object]",
+    "", ",,,,,,,,,",
+    "Invalid Date", "[object QMetaObject]",
+    "/foo/gim", "undefined",
     "123", "false",
     "", "QScriptEngine(name = \"\")"};
 void tst_QScriptValueGenerated::qscriptvalue_castQString_makeData(const char* expr)
 {
     static QHash<QString, QString> value;
     if (value.isEmpty()) {
-        value.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        value.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             value.insert(qscriptvalue_castQString_tagArray[i], qscriptvalue_castQString_valueArray[i]);
     }
     newRow(expr) << value.value(expr);
@@ -399,6 +408,11 @@ static QString qscriptvalue_castqsreal_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -433,6 +447,7 @@ static QString qscriptvalue_castqsreal_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -449,17 +464,17 @@ static qsreal qscriptvalue_castqsreal_valueArray[] = {
     65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(), qInf(), qInf(), qQNaN(), qQNaN(),
     0, 0, 0, 123, 1.23, 0, qQNaN(), qQNaN(), qQNaN(), 0,
     qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(),
-    qQNaN(), 0, qQNaN(), 22, qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), 0,
-    1, 0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 1126240820,
-    65536, 65537, qQNaN(), qInf(), qInf(), qQNaN(), 0, 0, 123, 12.4,
-    0, qQNaN(), qQNaN(), 0, qQNaN(), qQNaN(), qQNaN(), qQNaN(), 123, 0,
-    0, qQNaN()};
+    qQNaN(), 0, qQNaN(), 1, 0, 123, qQNaN(), qQNaN(), 22, qQNaN(),
+    qQNaN(), qQNaN(), qQNaN(), qQNaN(), 0, 1, 0, 122, 124, 0,
+    0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 1126240820, 65536, 65537, qQNaN(), qInf(), qInf(),
+    qQNaN(), 0, 0, 123, 12.4, 0, qQNaN(), qQNaN(), 0, qQNaN(),
+    qQNaN(), qQNaN(), qQNaN(), qQNaN(), 123, 0, 0, qQNaN()};
 void tst_QScriptValueGenerated::qscriptvalue_castqsreal_makeData(const char* expr)
 {
     static QHash<QString, qsreal> value;
     if (value.isEmpty()) {
-        value.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        value.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             value.insert(qscriptvalue_castqsreal_tagArray[i], qscriptvalue_castqsreal_valueArray[i]);
     }
     newRow(expr) << value.value(expr);
@@ -595,6 +610,11 @@ static QString qscriptvalue_castbool_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -629,6 +649,7 @@ static QString qscriptvalue_castbool_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -689,18 +710,21 @@ static bool qscriptvalue_castbool_valueArray[] = {
     true, true,
     true, true,
     true, true,
-    false, false,
-    true, false,
     true, true,
-    false, false,
     true, true,
+    true, false,
+    false, true,
+    false, true,
+    true, false,
+    false, true,
     true, true,
     true, true,
-    false, true,
+    true, false,
     true, true,
-    false, true,
+    true, false,
     true, true,
-    false, false,
+    true, false,
+    false, true,
     true, true,
     true, true,
     true, true,
@@ -710,8 +734,8 @@ void tst_QScriptValueGenerated::qscriptvalue_castbool_makeData(const char* expr)
 {
     static QHash<QString, bool> value;
     if (value.isEmpty()) {
-        value.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        value.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             value.insert(qscriptvalue_castbool_tagArray[i], qscriptvalue_castbool_valueArray[i]);
     }
     newRow(expr) << value.value(expr);
@@ -837,6 +861,11 @@ static QString qscriptvalue_castqint32_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -871,6 +900,7 @@ static QString qscriptvalue_castqint32_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -928,20 +958,23 @@ static qint32 qscriptvalue_castqint32_valueArray[] = {
     0, 0,
     0, 0,
     0, 0,
-    0, 22,
-    0, 0,
+    0, 1,
+    0, 123,
     0, 0,
+    22, 0,
     0, 0,
-    1, 0,
-    122, 124,
     0, 0,
-    123, 0,
-    0, 1126240820,
-    65536, 65537,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
     0, 0,
+    1126240820, 65536,
+    65537, 0,
     0, 0,
     0, 0,
-    123, 12,
+    0, 123,
+    12, 0,
     0, 0,
     0, 0,
     0, 0,
@@ -952,8 +985,8 @@ void tst_QScriptValueGenerated::qscriptvalue_castqint32_makeData(const char* exp
 {
     static QHash<QString, qint32> value;
     if (value.isEmpty()) {
-        value.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        value.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             value.insert(qscriptvalue_castqint32_tagArray[i], qscriptvalue_castqint32_valueArray[i]);
     }
     newRow(expr) << value.value(expr);
@@ -1079,6 +1112,11 @@ static QString qscriptvalue_castquint32_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -1113,6 +1151,7 @@ static QString qscriptvalue_castquint32_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -1170,20 +1209,23 @@ static quint32 qscriptvalue_castquint32_valueArray[] = {
     0, 0,
     0, 0,
     0, 0,
-    0, 22,
-    0, 0,
+    0, 1,
+    0, 123,
     0, 0,
+    22, 0,
     0, 0,
-    1, 0,
-    122, 124,
     0, 0,
-    123, 0,
-    0, 1126240820,
-    65536, 65537,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
     0, 0,
+    1126240820, 65536,
+    65537, 0,
     0, 0,
     0, 0,
-    123, 12,
+    0, 123,
+    12, 0,
     0, 0,
     0, 0,
     0, 0,
@@ -1194,8 +1236,8 @@ void tst_QScriptValueGenerated::qscriptvalue_castquint32_makeData(const char* ex
 {
     static QHash<QString, quint32> value;
     if (value.isEmpty()) {
-        value.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        value.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             value.insert(qscriptvalue_castquint32_tagArray[i], qscriptvalue_castquint32_valueArray[i]);
     }
     newRow(expr) << value.value(expr);
@@ -1321,6 +1363,11 @@ static QString qscriptvalue_castquint16_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -1355,6 +1402,7 @@ static QString qscriptvalue_castquint16_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -1412,20 +1460,23 @@ static quint16 qscriptvalue_castquint16_valueArray[] = {
     0, 0,
     0, 0,
     0, 0,
-    0, 22,
-    0, 0,
+    0, 1,
+    0, 123,
     0, 0,
+    22, 0,
     0, 0,
-    1, 0,
-    122, 124,
     0, 0,
-    123, 0,
-    0, 4660,
     0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
     0, 0,
+    4660, 0,
+    1, 0,
     0, 0,
     0, 0,
-    123, 12,
+    0, 123,
+    12, 0,
     0, 0,
     0, 0,
     0, 0,
@@ -1436,8 +1487,8 @@ void tst_QScriptValueGenerated::qscriptvalue_castquint16_makeData(const char* ex
 {
     static QHash<QString, quint16> value;
     if (value.isEmpty()) {
-        value.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        value.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             value.insert(qscriptvalue_castquint16_tagArray[i], qscriptvalue_castquint16_valueArray[i]);
     }
     newRow(expr) << value.value(expr);
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp
index 16d5770b71..f8a6cdad9c 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp
@@ -83,6 +83,7 @@ static QString equals_array[] = {
     "QScriptValue(true) <=> QScriptValue(true)",
     "QScriptValue(true) <=> QScriptValue(0, true)",
     "QScriptValue(true) <=> QScriptValue(engine, true)",
+    "QScriptValue(true) <=> engine->evaluate(\"new Boolean(true)\")",
     "QScriptValue(true) <=> engine->evaluate(\"true\")",
     "QScriptValue(false) <=> QScriptValue(false)",
     "QScriptValue(false) <=> QScriptValue(0)",
@@ -105,6 +106,7 @@ static QString equals_array[] = {
     "QScriptValue(false) <=> engine->evaluate(\"[]\")",
     "QScriptValue(false) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(false) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(false) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(false) <=> engine->evaluate(\"false\")",
     "QScriptValue(false) <=> engine->evaluate(\"0\")",
     "QScriptValue(false) <=> engine->evaluate(\"0.0\")",
@@ -141,6 +143,7 @@ static QString equals_array[] = {
     "QScriptValue(0) <=> engine->evaluate(\"[]\")",
     "QScriptValue(0) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(0) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(0) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(0) <=> engine->evaluate(\"false\")",
     "QScriptValue(0) <=> engine->evaluate(\"0\")",
     "QScriptValue(0) <=> engine->evaluate(\"0.0\")",
@@ -169,6 +172,7 @@ static QString equals_array[] = {
     "QScriptValue(0.0) <=> engine->evaluate(\"[]\")",
     "QScriptValue(0.0) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(0.0) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(0.0) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(0.0) <=> engine->evaluate(\"false\")",
     "QScriptValue(0.0) <=> engine->evaluate(\"0\")",
     "QScriptValue(0.0) <=> engine->evaluate(\"0.0\")",
@@ -182,6 +186,7 @@ static QString equals_array[] = {
     "QScriptValue(123.0) <=> QScriptValue(0, QString(\"123\"))",
     "QScriptValue(123.0) <=> QScriptValue(engine, 123.0)",
     "QScriptValue(123.0) <=> QScriptValue(engine, QString(\"123\"))",
+    "QScriptValue(123.0) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(123.0) <=> engine->evaluate(\"123.0\")",
     "QScriptValue(123.0) <=> engine->evaluate(\"'123'\")",
     "QScriptValue(123.0) <=> engine->newVariant(QVariant(123))",
@@ -242,6 +247,7 @@ static QString equals_array[] = {
     "QScriptValue(\"ciao\") <=> QScriptValue(0, QString::fromLatin1(\"ciao\"))",
     "QScriptValue(\"ciao\") <=> QScriptValue(engine, \"ciao\")",
     "QScriptValue(\"ciao\") <=> QScriptValue(engine, QString::fromLatin1(\"ciao\"))",
+    "QScriptValue(\"ciao\") <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(\"ciao\") <=> engine->evaluate(\"'ciao'\")",
     "QScriptValue(QString::fromLatin1(\"ciao\")) <=> QScriptValue(\"ciao\")",
     "QScriptValue(QString::fromLatin1(\"ciao\")) <=> QScriptValue(QString::fromLatin1(\"ciao\"))",
@@ -249,6 +255,7 @@ static QString equals_array[] = {
     "QScriptValue(QString::fromLatin1(\"ciao\")) <=> QScriptValue(0, QString::fromLatin1(\"ciao\"))",
     "QScriptValue(QString::fromLatin1(\"ciao\")) <=> QScriptValue(engine, \"ciao\")",
     "QScriptValue(QString::fromLatin1(\"ciao\")) <=> QScriptValue(engine, QString::fromLatin1(\"ciao\"))",
+    "QScriptValue(QString::fromLatin1(\"ciao\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(QString::fromLatin1(\"ciao\")) <=> engine->evaluate(\"'ciao'\")",
     "QScriptValue(QString(\"\")) <=> QScriptValue(false)",
     "QScriptValue(QString(\"\")) <=> QScriptValue(0)",
@@ -268,6 +275,7 @@ static QString equals_array[] = {
     "QScriptValue(QString(\"\")) <=> engine->evaluate(\"[]\")",
     "QScriptValue(QString(\"\")) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(QString(\"\")) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(QString(\"\")) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(QString(\"\")) <=> engine->evaluate(\"false\")",
     "QScriptValue(QString(\"\")) <=> engine->evaluate(\"0\")",
     "QScriptValue(QString(\"\")) <=> engine->evaluate(\"0.0\")",
@@ -292,6 +300,7 @@ static QString equals_array[] = {
     "QScriptValue(QString()) <=> engine->evaluate(\"[]\")",
     "QScriptValue(QString()) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(QString()) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(QString()) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(QString()) <=> engine->evaluate(\"false\")",
     "QScriptValue(QString()) <=> engine->evaluate(\"0\")",
     "QScriptValue(QString()) <=> engine->evaluate(\"0.0\")",
@@ -310,6 +319,7 @@ static QString equals_array[] = {
     "QScriptValue(QString(\"0\")) <=> QScriptValue(engine, 0)",
     "QScriptValue(QString(\"0\")) <=> QScriptValue(engine, 0.0)",
     "QScriptValue(QString(\"0\")) <=> QScriptValue(engine, QString(\"0\"))",
+    "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"false\")",
     "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"0\")",
     "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"0.0\")",
@@ -321,6 +331,7 @@ static QString equals_array[] = {
     "QScriptValue(QString(\"123\")) <=> QScriptValue(0, QString(\"123\"))",
     "QScriptValue(QString(\"123\")) <=> QScriptValue(engine, 123.0)",
     "QScriptValue(QString(\"123\")) <=> QScriptValue(engine, QString(\"123\"))",
+    "QScriptValue(QString(\"123\")) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(QString(\"123\")) <=> engine->evaluate(\"123.0\")",
     "QScriptValue(QString(\"123\")) <=> engine->evaluate(\"'123'\")",
     "QScriptValue(QString(\"123\")) <=> engine->newVariant(QVariant(123))",
@@ -353,6 +364,7 @@ static QString equals_array[] = {
     "QScriptValue(0, true) <=> QScriptValue(true)",
     "QScriptValue(0, true) <=> QScriptValue(0, true)",
     "QScriptValue(0, true) <=> QScriptValue(engine, true)",
+    "QScriptValue(0, true) <=> engine->evaluate(\"new Boolean(true)\")",
     "QScriptValue(0, true) <=> engine->evaluate(\"true\")",
     "QScriptValue(0, false) <=> QScriptValue(false)",
     "QScriptValue(0, false) <=> QScriptValue(0)",
@@ -375,6 +387,7 @@ static QString equals_array[] = {
     "QScriptValue(0, false) <=> engine->evaluate(\"[]\")",
     "QScriptValue(0, false) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(0, false) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(0, false) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(0, false) <=> engine->evaluate(\"false\")",
     "QScriptValue(0, false) <=> engine->evaluate(\"0\")",
     "QScriptValue(0, false) <=> engine->evaluate(\"0.0\")",
@@ -411,6 +424,7 @@ static QString equals_array[] = {
     "QScriptValue(0, 0) <=> engine->evaluate(\"[]\")",
     "QScriptValue(0, 0) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(0, 0) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(0, 0) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(0, 0) <=> engine->evaluate(\"false\")",
     "QScriptValue(0, 0) <=> engine->evaluate(\"0\")",
     "QScriptValue(0, 0) <=> engine->evaluate(\"0.0\")",
@@ -439,6 +453,7 @@ static QString equals_array[] = {
     "QScriptValue(0, 0.0) <=> engine->evaluate(\"[]\")",
     "QScriptValue(0, 0.0) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(0, 0.0) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(0, 0.0) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(0, 0.0) <=> engine->evaluate(\"false\")",
     "QScriptValue(0, 0.0) <=> engine->evaluate(\"0\")",
     "QScriptValue(0, 0.0) <=> engine->evaluate(\"0.0\")",
@@ -452,6 +467,7 @@ static QString equals_array[] = {
     "QScriptValue(0, 123.0) <=> QScriptValue(0, QString(\"123\"))",
     "QScriptValue(0, 123.0) <=> QScriptValue(engine, 123.0)",
     "QScriptValue(0, 123.0) <=> QScriptValue(engine, QString(\"123\"))",
+    "QScriptValue(0, 123.0) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0, 123.0) <=> engine->evaluate(\"123.0\")",
     "QScriptValue(0, 123.0) <=> engine->evaluate(\"'123'\")",
     "QScriptValue(0, 123.0) <=> engine->newVariant(QVariant(123))",
@@ -512,6 +528,7 @@ static QString equals_array[] = {
     "QScriptValue(0, \"ciao\") <=> QScriptValue(0, QString::fromLatin1(\"ciao\"))",
     "QScriptValue(0, \"ciao\") <=> QScriptValue(engine, \"ciao\")",
     "QScriptValue(0, \"ciao\") <=> QScriptValue(engine, QString::fromLatin1(\"ciao\"))",
+    "QScriptValue(0, \"ciao\") <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(0, \"ciao\") <=> engine->evaluate(\"'ciao'\")",
     "QScriptValue(0, QString::fromLatin1(\"ciao\")) <=> QScriptValue(\"ciao\")",
     "QScriptValue(0, QString::fromLatin1(\"ciao\")) <=> QScriptValue(QString::fromLatin1(\"ciao\"))",
@@ -519,6 +536,7 @@ static QString equals_array[] = {
     "QScriptValue(0, QString::fromLatin1(\"ciao\")) <=> QScriptValue(0, QString::fromLatin1(\"ciao\"))",
     "QScriptValue(0, QString::fromLatin1(\"ciao\")) <=> QScriptValue(engine, \"ciao\")",
     "QScriptValue(0, QString::fromLatin1(\"ciao\")) <=> QScriptValue(engine, QString::fromLatin1(\"ciao\"))",
+    "QScriptValue(0, QString::fromLatin1(\"ciao\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(0, QString::fromLatin1(\"ciao\")) <=> engine->evaluate(\"'ciao'\")",
     "QScriptValue(0, QString(\"\")) <=> QScriptValue(false)",
     "QScriptValue(0, QString(\"\")) <=> QScriptValue(0)",
@@ -538,6 +556,7 @@ static QString equals_array[] = {
     "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"[]\")",
     "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"false\")",
     "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"0\")",
     "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"0.0\")",
@@ -562,6 +581,7 @@ static QString equals_array[] = {
     "QScriptValue(0, QString()) <=> engine->evaluate(\"[]\")",
     "QScriptValue(0, QString()) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(0, QString()) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(0, QString()) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(0, QString()) <=> engine->evaluate(\"false\")",
     "QScriptValue(0, QString()) <=> engine->evaluate(\"0\")",
     "QScriptValue(0, QString()) <=> engine->evaluate(\"0.0\")",
@@ -580,6 +600,7 @@ static QString equals_array[] = {
     "QScriptValue(0, QString(\"0\")) <=> QScriptValue(engine, 0)",
     "QScriptValue(0, QString(\"0\")) <=> QScriptValue(engine, 0.0)",
     "QScriptValue(0, QString(\"0\")) <=> QScriptValue(engine, QString(\"0\"))",
+    "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"false\")",
     "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"0\")",
     "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"0.0\")",
@@ -591,6 +612,7 @@ static QString equals_array[] = {
     "QScriptValue(0, QString(\"123\")) <=> QScriptValue(0, QString(\"123\"))",
     "QScriptValue(0, QString(\"123\")) <=> QScriptValue(engine, 123.0)",
     "QScriptValue(0, QString(\"123\")) <=> QScriptValue(engine, QString(\"123\"))",
+    "QScriptValue(0, QString(\"123\")) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0, QString(\"123\")) <=> engine->evaluate(\"123.0\")",
     "QScriptValue(0, QString(\"123\")) <=> engine->evaluate(\"'123'\")",
     "QScriptValue(0, QString(\"123\")) <=> engine->newVariant(QVariant(123))",
@@ -622,6 +644,7 @@ static QString equals_array[] = {
     "QScriptValue(engine, true) <=> QScriptValue(true)",
     "QScriptValue(engine, true) <=> QScriptValue(0, true)",
     "QScriptValue(engine, true) <=> QScriptValue(engine, true)",
+    "QScriptValue(engine, true) <=> engine->evaluate(\"new Boolean(true)\")",
     "QScriptValue(engine, true) <=> engine->evaluate(\"true\")",
     "QScriptValue(engine, false) <=> QScriptValue(false)",
     "QScriptValue(engine, false) <=> QScriptValue(0)",
@@ -644,6 +667,7 @@ static QString equals_array[] = {
     "QScriptValue(engine, false) <=> engine->evaluate(\"[]\")",
     "QScriptValue(engine, false) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(engine, false) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(engine, false) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(engine, false) <=> engine->evaluate(\"false\")",
     "QScriptValue(engine, false) <=> engine->evaluate(\"0\")",
     "QScriptValue(engine, false) <=> engine->evaluate(\"0.0\")",
@@ -680,6 +704,7 @@ static QString equals_array[] = {
     "QScriptValue(engine, 0) <=> engine->evaluate(\"[]\")",
     "QScriptValue(engine, 0) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(engine, 0) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(engine, 0) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(engine, 0) <=> engine->evaluate(\"false\")",
     "QScriptValue(engine, 0) <=> engine->evaluate(\"0\")",
     "QScriptValue(engine, 0) <=> engine->evaluate(\"0.0\")",
@@ -708,6 +733,7 @@ static QString equals_array[] = {
     "QScriptValue(engine, 0.0) <=> engine->evaluate(\"[]\")",
     "QScriptValue(engine, 0.0) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(engine, 0.0) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(engine, 0.0) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(engine, 0.0) <=> engine->evaluate(\"false\")",
     "QScriptValue(engine, 0.0) <=> engine->evaluate(\"0\")",
     "QScriptValue(engine, 0.0) <=> engine->evaluate(\"0.0\")",
@@ -721,6 +747,7 @@ static QString equals_array[] = {
     "QScriptValue(engine, 123.0) <=> QScriptValue(0, QString(\"123\"))",
     "QScriptValue(engine, 123.0) <=> QScriptValue(engine, 123.0)",
     "QScriptValue(engine, 123.0) <=> QScriptValue(engine, QString(\"123\"))",
+    "QScriptValue(engine, 123.0) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(engine, 123.0) <=> engine->evaluate(\"123.0\")",
     "QScriptValue(engine, 123.0) <=> engine->evaluate(\"'123'\")",
     "QScriptValue(engine, 123.0) <=> engine->newVariant(QVariant(123))",
@@ -781,6 +808,7 @@ static QString equals_array[] = {
     "QScriptValue(engine, \"ciao\") <=> QScriptValue(0, QString::fromLatin1(\"ciao\"))",
     "QScriptValue(engine, \"ciao\") <=> QScriptValue(engine, \"ciao\")",
     "QScriptValue(engine, \"ciao\") <=> QScriptValue(engine, QString::fromLatin1(\"ciao\"))",
+    "QScriptValue(engine, \"ciao\") <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(engine, \"ciao\") <=> engine->evaluate(\"'ciao'\")",
     "QScriptValue(engine, QString::fromLatin1(\"ciao\")) <=> QScriptValue(\"ciao\")",
     "QScriptValue(engine, QString::fromLatin1(\"ciao\")) <=> QScriptValue(QString::fromLatin1(\"ciao\"))",
@@ -788,6 +816,7 @@ static QString equals_array[] = {
     "QScriptValue(engine, QString::fromLatin1(\"ciao\")) <=> QScriptValue(0, QString::fromLatin1(\"ciao\"))",
     "QScriptValue(engine, QString::fromLatin1(\"ciao\")) <=> QScriptValue(engine, \"ciao\")",
     "QScriptValue(engine, QString::fromLatin1(\"ciao\")) <=> QScriptValue(engine, QString::fromLatin1(\"ciao\"))",
+    "QScriptValue(engine, QString::fromLatin1(\"ciao\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(engine, QString::fromLatin1(\"ciao\")) <=> engine->evaluate(\"'ciao'\")",
     "QScriptValue(engine, QString(\"\")) <=> QScriptValue(false)",
     "QScriptValue(engine, QString(\"\")) <=> QScriptValue(0)",
@@ -807,6 +836,7 @@ static QString equals_array[] = {
     "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"[]\")",
     "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"false\")",
     "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"0\")",
     "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"0.0\")",
@@ -831,6 +861,7 @@ static QString equals_array[] = {
     "QScriptValue(engine, QString()) <=> engine->evaluate(\"[]\")",
     "QScriptValue(engine, QString()) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(engine, QString()) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(engine, QString()) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(engine, QString()) <=> engine->evaluate(\"false\")",
     "QScriptValue(engine, QString()) <=> engine->evaluate(\"0\")",
     "QScriptValue(engine, QString()) <=> engine->evaluate(\"0.0\")",
@@ -849,6 +880,7 @@ static QString equals_array[] = {
     "QScriptValue(engine, QString(\"0\")) <=> QScriptValue(engine, 0)",
     "QScriptValue(engine, QString(\"0\")) <=> QScriptValue(engine, 0.0)",
     "QScriptValue(engine, QString(\"0\")) <=> QScriptValue(engine, QString(\"0\"))",
+    "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"new Boolean(false)\")",
     "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"false\")",
     "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"0\")",
     "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"0.0\")",
@@ -860,6 +892,7 @@ static QString equals_array[] = {
     "QScriptValue(engine, QString(\"123\")) <=> QScriptValue(0, QString(\"123\"))",
     "QScriptValue(engine, QString(\"123\")) <=> QScriptValue(engine, 123.0)",
     "QScriptValue(engine, QString(\"123\")) <=> QScriptValue(engine, QString(\"123\"))",
+    "QScriptValue(engine, QString(\"123\")) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(engine, QString(\"123\")) <=> engine->evaluate(\"123.0\")",
     "QScriptValue(engine, QString(\"123\")) <=> engine->evaluate(\"'123'\")",
     "QScriptValue(engine, QString(\"123\")) <=> engine->newVariant(QVariant(123))",
@@ -950,6 +983,53 @@ static QString equals_array[] = {
     "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"0.0\")",
     "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"''\")",
     "engine->evaluate(\"new Error()\") <=> engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(true)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0, true)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(engine, true)",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"true\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(false)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0.0)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(QString(\"\"))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(QString())",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(QString(\"0\"))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, false)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, 0)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, 0.0)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, QString(\"\"))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, QString())",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, QString(\"0\"))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, false)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, 0)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, 0.0)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, QString(\"\"))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, QString())",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, QString(\"0\"))",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"false\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"0\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"0.0\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"''\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"'0'\")",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(123.0)",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(QString(\"123\"))",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(0, 123.0)",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(0, QString(\"123\"))",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(engine, 123.0)",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(engine, QString(\"123\"))",
+    "engine->evaluate(\"new Number(123)\") <=> engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new Number(123)\") <=> engine->evaluate(\"123.0\")",
+    "engine->evaluate(\"new Number(123)\") <=> engine->evaluate(\"'123'\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\") <=> QScriptValue(\"ciao\")",
+    "engine->evaluate(\"new String('ciao')\") <=> QScriptValue(QString::fromLatin1(\"ciao\"))",
+    "engine->evaluate(\"new String('ciao')\") <=> QScriptValue(0, \"ciao\")",
+    "engine->evaluate(\"new String('ciao')\") <=> QScriptValue(0, QString::fromLatin1(\"ciao\"))",
+    "engine->evaluate(\"new String('ciao')\") <=> QScriptValue(engine, \"ciao\")",
+    "engine->evaluate(\"new String('ciao')\") <=> QScriptValue(engine, QString::fromLatin1(\"ciao\"))",
+    "engine->evaluate(\"new String('ciao')\") <=> engine->evaluate(\"new String('ciao')\")",
+    "engine->evaluate(\"new String('ciao')\") <=> engine->evaluate(\"'ciao'\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\") <=> engine->evaluate(\"Null\")",
@@ -982,6 +1062,7 @@ static QString equals_array[] = {
     "engine->evaluate(\"true\") <=> QScriptValue(true)",
     "engine->evaluate(\"true\") <=> QScriptValue(0, true)",
     "engine->evaluate(\"true\") <=> QScriptValue(engine, true)",
+    "engine->evaluate(\"true\") <=> engine->evaluate(\"new Boolean(true)\")",
     "engine->evaluate(\"true\") <=> engine->evaluate(\"true\")",
     "engine->evaluate(\"false\") <=> QScriptValue(false)",
     "engine->evaluate(\"false\") <=> QScriptValue(0)",
@@ -1004,6 +1085,7 @@ static QString equals_array[] = {
     "engine->evaluate(\"false\") <=> engine->evaluate(\"[]\")",
     "engine->evaluate(\"false\") <=> engine->evaluate(\"Array.prototype\")",
     "engine->evaluate(\"false\") <=> engine->evaluate(\"new Array()\")",
+    "engine->evaluate(\"false\") <=> engine->evaluate(\"new Boolean(false)\")",
     "engine->evaluate(\"false\") <=> engine->evaluate(\"false\")",
     "engine->evaluate(\"false\") <=> engine->evaluate(\"0\")",
     "engine->evaluate(\"false\") <=> engine->evaluate(\"0.0\")",
@@ -1040,6 +1122,7 @@ static QString equals_array[] = {
     "engine->evaluate(\"0\") <=> engine->evaluate(\"[]\")",
     "engine->evaluate(\"0\") <=> engine->evaluate(\"Array.prototype\")",
     "engine->evaluate(\"0\") <=> engine->evaluate(\"new Array()\")",
+    "engine->evaluate(\"0\") <=> engine->evaluate(\"new Boolean(false)\")",
     "engine->evaluate(\"0\") <=> engine->evaluate(\"false\")",
     "engine->evaluate(\"0\") <=> engine->evaluate(\"0\")",
     "engine->evaluate(\"0\") <=> engine->evaluate(\"0.0\")",
@@ -1068,6 +1151,7 @@ static QString equals_array[] = {
     "engine->evaluate(\"0.0\") <=> engine->evaluate(\"[]\")",
     "engine->evaluate(\"0.0\") <=> engine->evaluate(\"Array.prototype\")",
     "engine->evaluate(\"0.0\") <=> engine->evaluate(\"new Array()\")",
+    "engine->evaluate(\"0.0\") <=> engine->evaluate(\"new Boolean(false)\")",
     "engine->evaluate(\"0.0\") <=> engine->evaluate(\"false\")",
     "engine->evaluate(\"0.0\") <=> engine->evaluate(\"0\")",
     "engine->evaluate(\"0.0\") <=> engine->evaluate(\"0.0\")",
@@ -1081,6 +1165,7 @@ static QString equals_array[] = {
     "engine->evaluate(\"123.0\") <=> QScriptValue(0, QString(\"123\"))",
     "engine->evaluate(\"123.0\") <=> QScriptValue(engine, 123.0)",
     "engine->evaluate(\"123.0\") <=> QScriptValue(engine, QString(\"123\"))",
+    "engine->evaluate(\"123.0\") <=> engine->evaluate(\"new Number(123)\")",
     "engine->evaluate(\"123.0\") <=> engine->evaluate(\"123.0\")",
     "engine->evaluate(\"123.0\") <=> engine->evaluate(\"'123'\")",
     "engine->evaluate(\"123.0\") <=> engine->newVariant(QVariant(123))",
@@ -1124,6 +1209,7 @@ static QString equals_array[] = {
     "engine->evaluate(\"'ciao'\") <=> QScriptValue(0, QString::fromLatin1(\"ciao\"))",
     "engine->evaluate(\"'ciao'\") <=> QScriptValue(engine, \"ciao\")",
     "engine->evaluate(\"'ciao'\") <=> QScriptValue(engine, QString::fromLatin1(\"ciao\"))",
+    "engine->evaluate(\"'ciao'\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"'ciao'\") <=> engine->evaluate(\"'ciao'\")",
     "engine->evaluate(\"''\") <=> QScriptValue(false)",
     "engine->evaluate(\"''\") <=> QScriptValue(0)",
@@ -1143,6 +1229,7 @@ static QString equals_array[] = {
     "engine->evaluate(\"''\") <=> engine->evaluate(\"[]\")",
     "engine->evaluate(\"''\") <=> engine->evaluate(\"Array.prototype\")",
     "engine->evaluate(\"''\") <=> engine->evaluate(\"new Array()\")",
+    "engine->evaluate(\"''\") <=> engine->evaluate(\"new Boolean(false)\")",
     "engine->evaluate(\"''\") <=> engine->evaluate(\"false\")",
     "engine->evaluate(\"''\") <=> engine->evaluate(\"0\")",
     "engine->evaluate(\"''\") <=> engine->evaluate(\"0.0\")",
@@ -1161,6 +1248,7 @@ static QString equals_array[] = {
     "engine->evaluate(\"'0'\") <=> QScriptValue(engine, 0)",
     "engine->evaluate(\"'0'\") <=> QScriptValue(engine, 0.0)",
     "engine->evaluate(\"'0'\") <=> QScriptValue(engine, QString(\"0\"))",
+    "engine->evaluate(\"'0'\") <=> engine->evaluate(\"new Boolean(false)\")",
     "engine->evaluate(\"'0'\") <=> engine->evaluate(\"false\")",
     "engine->evaluate(\"'0'\") <=> engine->evaluate(\"0\")",
     "engine->evaluate(\"'0'\") <=> engine->evaluate(\"0.0\")",
@@ -1172,6 +1260,7 @@ static QString equals_array[] = {
     "engine->evaluate(\"'123'\") <=> QScriptValue(0, QString(\"123\"))",
     "engine->evaluate(\"'123'\") <=> QScriptValue(engine, 123.0)",
     "engine->evaluate(\"'123'\") <=> QScriptValue(engine, QString(\"123\"))",
+    "engine->evaluate(\"'123'\") <=> engine->evaluate(\"new Number(123)\")",
     "engine->evaluate(\"'123'\") <=> engine->evaluate(\"123.0\")",
     "engine->evaluate(\"'123'\") <=> engine->evaluate(\"'123'\")",
     "engine->evaluate(\"'123'\") <=> engine->newVariant(QVariant(123))",
@@ -1225,6 +1314,7 @@ static QString equals_array[] = {
     "engine->newArray(10) <=> engine->newArray(10)",
     "engine->newDate(QDateTime()) <=> engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject) <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant()) <=> engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123)) <=> QScriptValue(123.0)",
     "engine->newVariant(QVariant(123)) <=> QScriptValue(QString(\"123\"))",
@@ -1277,8 +1367,8 @@ void tst_QScriptValueGenerated::equals_makeData(const char *expr)
 {
     static QSet<QString> equals;
     if (equals.isEmpty()) {
-        equals.reserve(1217);
-        for (unsigned i = 0; i < 1217; ++i)
+        equals.reserve(1307);
+        for (unsigned i = 0; i < 1307; ++i)
             equals.insert(equals_array[i]);
     }
     QHash<QString, QScriptValue>::const_iterator it;
@@ -1697,6 +1787,11 @@ static QString strictlyEquals_array[] = {
     "engine->evaluate(\"new Object()\") <=> engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\") <=> engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\") <=> engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\") <=> engine->evaluate(\"Null\")",
@@ -1819,6 +1914,7 @@ static QString strictlyEquals_array[] = {
     "engine->newArray(10) <=> engine->newArray(10)",
     "engine->newDate(QDateTime()) <=> engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject) <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant()) <=> engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123)) <=> engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false)) <=> engine->newVariant(QVariant(false))",
@@ -1834,8 +1930,8 @@ void tst_QScriptValueGenerated::strictlyEquals_makeData(const char *expr)
 {
     static QSet<QString> equals;
     if (equals.isEmpty()) {
-        equals.reserve(523);
-        for (unsigned i = 0; i < 523; ++i)
+        equals.reserve(529);
+        for (unsigned i = 0; i < 529; ++i)
             equals.insert(strictlyEquals_array[i]);
     }
     QHash<QString, QScriptValue>::const_iterator it;
@@ -1899,6 +1995,8 @@ static QString lessThan_array[] = {
     "QScriptValue(QScriptValue::NullValue) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(QScriptValue::NullValue) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(QScriptValue::NullValue) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(QScriptValue::NullValue) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(QScriptValue::NullValue) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(QScriptValue::NullValue) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(QScriptValue::NullValue) <=> engine->evaluate(\"true\")",
     "QScriptValue(QScriptValue::NullValue) <=> engine->evaluate(\"122\")",
@@ -1942,6 +2040,7 @@ static QString lessThan_array[] = {
     "QScriptValue(true) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(true) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(true) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(true) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(true) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(true) <=> engine->evaluate(\"122\")",
     "QScriptValue(true) <=> engine->evaluate(\"124\")",
@@ -1989,6 +2088,8 @@ static QString lessThan_array[] = {
     "QScriptValue(false) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(false) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(false) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(false) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(false) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(false) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(false) <=> engine->evaluate(\"true\")",
     "QScriptValue(false) <=> engine->evaluate(\"122\")",
@@ -2026,6 +2127,7 @@ static QString lessThan_array[] = {
     "QScriptValue(int(122)) <=> QScriptValue(engine, qInf())",
     "QScriptValue(int(122)) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(int(122)) <=> QScriptValue(engine, QString(\"123\"))",
+    "QScriptValue(int(122)) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(int(122)) <=> engine->evaluate(\"124\")",
     "QScriptValue(int(122)) <=> engine->evaluate(\"123.0\")",
     "QScriptValue(int(122)) <=> engine->evaluate(\"0x43211234\")",
@@ -2089,6 +2191,8 @@ static QString lessThan_array[] = {
     "QScriptValue(0) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(0) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(0) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(0) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0) <=> engine->evaluate(\"true\")",
     "QScriptValue(0) <=> engine->evaluate(\"122\")",
@@ -2138,6 +2242,8 @@ static QString lessThan_array[] = {
     "QScriptValue(0.0) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(0.0) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(0.0) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(0.0) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0.0) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0.0) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0.0) <=> engine->evaluate(\"true\")",
     "QScriptValue(0.0) <=> engine->evaluate(\"122\")",
@@ -2207,6 +2313,8 @@ static QString lessThan_array[] = {
     "QScriptValue(6.37e-8) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(6.37e-8) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(6.37e-8) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(6.37e-8) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(6.37e-8) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(6.37e-8) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(6.37e-8) <=> engine->evaluate(\"true\")",
     "QScriptValue(6.37e-8) <=> engine->evaluate(\"122\")",
@@ -2279,6 +2387,9 @@ static QString lessThan_array[] = {
     "QScriptValue(-6.37e-8) <=> engine->evaluate(\"[]\")",
     "QScriptValue(-6.37e-8) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(-6.37e-8) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(-6.37e-8) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(-6.37e-8) <=> engine->evaluate(\"new Boolean(false)\")",
+    "QScriptValue(-6.37e-8) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(-6.37e-8) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(-6.37e-8) <=> engine->evaluate(\"null\")",
     "QScriptValue(-6.37e-8) <=> engine->evaluate(\"true\")",
@@ -2398,6 +2509,9 @@ static QString lessThan_array[] = {
     "QScriptValue(-qInf()) <=> engine->evaluate(\"[]\")",
     "QScriptValue(-qInf()) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(-qInf()) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(-qInf()) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(-qInf()) <=> engine->evaluate(\"new Boolean(false)\")",
+    "QScriptValue(-qInf()) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(-qInf()) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(-qInf()) <=> engine->evaluate(\"null\")",
     "QScriptValue(-qInf()) <=> engine->evaluate(\"true\")",
@@ -2438,6 +2552,7 @@ static QString lessThan_array[] = {
     "QScriptValue(\"NaN\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "QScriptValue(\"NaN\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(\"NaN\") <=> engine->evaluate(\"new Object()\")",
+    "QScriptValue(\"NaN\") <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(\"NaN\") <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(\"NaN\") <=> engine->evaluate(\"Null\")",
     "QScriptValue(\"NaN\") <=> engine->evaluate(\"True\")",
@@ -2465,6 +2580,7 @@ static QString lessThan_array[] = {
     "QScriptValue(\"Infinity\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "QScriptValue(\"Infinity\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(\"Infinity\") <=> engine->evaluate(\"new Object()\")",
+    "QScriptValue(\"Infinity\") <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(\"Infinity\") <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(\"Infinity\") <=> engine->evaluate(\"Null\")",
     "QScriptValue(\"Infinity\") <=> engine->evaluate(\"True\")",
@@ -2549,6 +2665,11 @@ static QString lessThan_array[] = {
     "QScriptValue(\"-Infinity\") <=> engine->evaluate(\"/foo/\")",
     "QScriptValue(\"-Infinity\") <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(\"-Infinity\") <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(\"-Infinity\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(\"-Infinity\") <=> engine->evaluate(\"new Boolean(false)\")",
+    "QScriptValue(\"-Infinity\") <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(\"-Infinity\") <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "QScriptValue(\"-Infinity\") <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(\"-Infinity\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(\"-Infinity\") <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(\"-Infinity\") <=> engine->evaluate(\"Null\")",
@@ -2575,6 +2696,7 @@ static QString lessThan_array[] = {
     "QScriptValue(\"-Infinity\") <=> engine->nullValue()",
     "QScriptValue(\"-Infinity\") <=> engine->newObject()",
     "QScriptValue(\"-Infinity\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "QScriptValue(\"-Infinity\") <=> engine->newRegExp(\"foo\", \"gim\")",
     "QScriptValue(\"-Infinity\") <=> engine->newVariant(QVariant(123))",
     "QScriptValue(\"-Infinity\") <=> engine->newVariant(QVariant(false))",
     "QScriptValue(\"-Infinity\") <=> engine->newQObject(0)",
@@ -2659,6 +2781,10 @@ static QString lessThan_array[] = {
     "QScriptValue(QString(\"\")) <=> engine->evaluate(\"/foo/\")",
     "QScriptValue(QString(\"\")) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(QString(\"\")) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(QString(\"\")) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(QString(\"\")) <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(QString(\"\")) <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "QScriptValue(QString(\"\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(QString(\"\")) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(QString(\"\")) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(QString(\"\")) <=> engine->evaluate(\"Null\")",
@@ -2680,6 +2806,7 @@ static QString lessThan_array[] = {
     "QScriptValue(QString(\"\")) <=> engine->newObject()",
     "QScriptValue(QString(\"\")) <=> engine->newArray(10)",
     "QScriptValue(QString(\"\")) <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "QScriptValue(QString(\"\")) <=> engine->newRegExp(\"foo\", \"gim\")",
     "QScriptValue(QString(\"\")) <=> engine->newVariant(QVariant(123))",
     "QScriptValue(QString(\"\")) <=> engine->newQObject(engine)",
     "QScriptValue(QString()) <=> QScriptValue(true)",
@@ -2746,6 +2873,10 @@ static QString lessThan_array[] = {
     "QScriptValue(QString()) <=> engine->evaluate(\"/foo/\")",
     "QScriptValue(QString()) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(QString()) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(QString()) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(QString()) <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(QString()) <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "QScriptValue(QString()) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(QString()) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(QString()) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(QString()) <=> engine->evaluate(\"Null\")",
@@ -2767,6 +2898,7 @@ static QString lessThan_array[] = {
     "QScriptValue(QString()) <=> engine->newObject()",
     "QScriptValue(QString()) <=> engine->newArray(10)",
     "QScriptValue(QString()) <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "QScriptValue(QString()) <=> engine->newRegExp(\"foo\", \"gim\")",
     "QScriptValue(QString()) <=> engine->newVariant(QVariant(123))",
     "QScriptValue(QString()) <=> engine->newQObject(engine)",
     "QScriptValue(QString(\"0\")) <=> QScriptValue(true)",
@@ -2826,6 +2958,9 @@ static QString lessThan_array[] = {
     "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(QString(\"0\")) <=> engine->evaluate(\"Null\")",
@@ -2886,6 +3021,7 @@ static QString lessThan_array[] = {
     "QScriptValue(QString(\"123\")) <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(QString(\"123\")) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(QString(\"123\")) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(QString(\"123\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(QString(\"123\")) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(QString(\"123\")) <=> engine->evaluate(\"Null\")",
     "QScriptValue(QString(\"123\")) <=> engine->evaluate(\"True\")",
@@ -2947,6 +3083,8 @@ static QString lessThan_array[] = {
     "QScriptValue(QString(\"12.4\")) <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(QString(\"12.4\")) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(QString(\"12.4\")) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(QString(\"12.4\")) <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(QString(\"12.4\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(QString(\"12.4\")) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(QString(\"12.4\")) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(QString(\"12.4\")) <=> engine->evaluate(\"Null\")",
@@ -3001,6 +3139,8 @@ static QString lessThan_array[] = {
     "QScriptValue(0, QScriptValue::NullValue) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(0, QScriptValue::NullValue) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(0, QScriptValue::NullValue) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(0, QScriptValue::NullValue) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0, QScriptValue::NullValue) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0, QScriptValue::NullValue) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, QScriptValue::NullValue) <=> engine->evaluate(\"true\")",
     "QScriptValue(0, QScriptValue::NullValue) <=> engine->evaluate(\"122\")",
@@ -3044,6 +3184,7 @@ static QString lessThan_array[] = {
     "QScriptValue(0, true) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(0, true) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(0, true) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(0, true) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0, true) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, true) <=> engine->evaluate(\"122\")",
     "QScriptValue(0, true) <=> engine->evaluate(\"124\")",
@@ -3091,6 +3232,8 @@ static QString lessThan_array[] = {
     "QScriptValue(0, false) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(0, false) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(0, false) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(0, false) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0, false) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0, false) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, false) <=> engine->evaluate(\"true\")",
     "QScriptValue(0, false) <=> engine->evaluate(\"122\")",
@@ -3128,6 +3271,7 @@ static QString lessThan_array[] = {
     "QScriptValue(0, int(122)) <=> QScriptValue(engine, qInf())",
     "QScriptValue(0, int(122)) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(0, int(122)) <=> QScriptValue(engine, QString(\"123\"))",
+    "QScriptValue(0, int(122)) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0, int(122)) <=> engine->evaluate(\"124\")",
     "QScriptValue(0, int(122)) <=> engine->evaluate(\"123.0\")",
     "QScriptValue(0, int(122)) <=> engine->evaluate(\"0x43211234\")",
@@ -3191,6 +3335,8 @@ static QString lessThan_array[] = {
     "QScriptValue(0, 0) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(0, 0) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(0, 0) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(0, 0) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0, 0) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0, 0) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, 0) <=> engine->evaluate(\"true\")",
     "QScriptValue(0, 0) <=> engine->evaluate(\"122\")",
@@ -3240,6 +3386,8 @@ static QString lessThan_array[] = {
     "QScriptValue(0, 0.0) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(0, 0.0) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(0, 0.0) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(0, 0.0) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0, 0.0) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0, 0.0) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, 0.0) <=> engine->evaluate(\"true\")",
     "QScriptValue(0, 0.0) <=> engine->evaluate(\"122\")",
@@ -3309,6 +3457,8 @@ static QString lessThan_array[] = {
     "QScriptValue(0, 6.37e-8) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(0, 6.37e-8) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(0, 6.37e-8) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(0, 6.37e-8) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0, 6.37e-8) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0, 6.37e-8) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, 6.37e-8) <=> engine->evaluate(\"true\")",
     "QScriptValue(0, 6.37e-8) <=> engine->evaluate(\"122\")",
@@ -3381,6 +3531,9 @@ static QString lessThan_array[] = {
     "QScriptValue(0, -6.37e-8) <=> engine->evaluate(\"[]\")",
     "QScriptValue(0, -6.37e-8) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(0, -6.37e-8) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(0, -6.37e-8) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0, -6.37e-8) <=> engine->evaluate(\"new Boolean(false)\")",
+    "QScriptValue(0, -6.37e-8) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0, -6.37e-8) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, -6.37e-8) <=> engine->evaluate(\"null\")",
     "QScriptValue(0, -6.37e-8) <=> engine->evaluate(\"true\")",
@@ -3500,6 +3653,9 @@ static QString lessThan_array[] = {
     "QScriptValue(0, -qInf()) <=> engine->evaluate(\"[]\")",
     "QScriptValue(0, -qInf()) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(0, -qInf()) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(0, -qInf()) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0, -qInf()) <=> engine->evaluate(\"new Boolean(false)\")",
+    "QScriptValue(0, -qInf()) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(0, -qInf()) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, -qInf()) <=> engine->evaluate(\"null\")",
     "QScriptValue(0, -qInf()) <=> engine->evaluate(\"true\")",
@@ -3540,6 +3696,7 @@ static QString lessThan_array[] = {
     "QScriptValue(0, \"NaN\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "QScriptValue(0, \"NaN\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(0, \"NaN\") <=> engine->evaluate(\"new Object()\")",
+    "QScriptValue(0, \"NaN\") <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(0, \"NaN\") <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(0, \"NaN\") <=> engine->evaluate(\"Null\")",
     "QScriptValue(0, \"NaN\") <=> engine->evaluate(\"True\")",
@@ -3567,6 +3724,7 @@ static QString lessThan_array[] = {
     "QScriptValue(0, \"Infinity\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "QScriptValue(0, \"Infinity\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(0, \"Infinity\") <=> engine->evaluate(\"new Object()\")",
+    "QScriptValue(0, \"Infinity\") <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(0, \"Infinity\") <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(0, \"Infinity\") <=> engine->evaluate(\"Null\")",
     "QScriptValue(0, \"Infinity\") <=> engine->evaluate(\"True\")",
@@ -3651,6 +3809,11 @@ static QString lessThan_array[] = {
     "QScriptValue(0, \"-Infinity\") <=> engine->evaluate(\"/foo/\")",
     "QScriptValue(0, \"-Infinity\") <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(0, \"-Infinity\") <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(0, \"-Infinity\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0, \"-Infinity\") <=> engine->evaluate(\"new Boolean(false)\")",
+    "QScriptValue(0, \"-Infinity\") <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(0, \"-Infinity\") <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "QScriptValue(0, \"-Infinity\") <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(0, \"-Infinity\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, \"-Infinity\") <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(0, \"-Infinity\") <=> engine->evaluate(\"Null\")",
@@ -3677,6 +3840,7 @@ static QString lessThan_array[] = {
     "QScriptValue(0, \"-Infinity\") <=> engine->nullValue()",
     "QScriptValue(0, \"-Infinity\") <=> engine->newObject()",
     "QScriptValue(0, \"-Infinity\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "QScriptValue(0, \"-Infinity\") <=> engine->newRegExp(\"foo\", \"gim\")",
     "QScriptValue(0, \"-Infinity\") <=> engine->newVariant(QVariant(123))",
     "QScriptValue(0, \"-Infinity\") <=> engine->newVariant(QVariant(false))",
     "QScriptValue(0, \"-Infinity\") <=> engine->newQObject(0)",
@@ -3761,6 +3925,10 @@ static QString lessThan_array[] = {
     "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"/foo/\")",
     "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(0, QString(\"\")) <=> engine->evaluate(\"Null\")",
@@ -3782,6 +3950,7 @@ static QString lessThan_array[] = {
     "QScriptValue(0, QString(\"\")) <=> engine->newObject()",
     "QScriptValue(0, QString(\"\")) <=> engine->newArray(10)",
     "QScriptValue(0, QString(\"\")) <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "QScriptValue(0, QString(\"\")) <=> engine->newRegExp(\"foo\", \"gim\")",
     "QScriptValue(0, QString(\"\")) <=> engine->newVariant(QVariant(123))",
     "QScriptValue(0, QString(\"\")) <=> engine->newQObject(engine)",
     "QScriptValue(0, QString()) <=> QScriptValue(true)",
@@ -3848,6 +4017,10 @@ static QString lessThan_array[] = {
     "QScriptValue(0, QString()) <=> engine->evaluate(\"/foo/\")",
     "QScriptValue(0, QString()) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(0, QString()) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(0, QString()) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0, QString()) <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(0, QString()) <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "QScriptValue(0, QString()) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(0, QString()) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, QString()) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(0, QString()) <=> engine->evaluate(\"Null\")",
@@ -3869,6 +4042,7 @@ static QString lessThan_array[] = {
     "QScriptValue(0, QString()) <=> engine->newObject()",
     "QScriptValue(0, QString()) <=> engine->newArray(10)",
     "QScriptValue(0, QString()) <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "QScriptValue(0, QString()) <=> engine->newRegExp(\"foo\", \"gim\")",
     "QScriptValue(0, QString()) <=> engine->newVariant(QVariant(123))",
     "QScriptValue(0, QString()) <=> engine->newQObject(engine)",
     "QScriptValue(0, QString(\"0\")) <=> QScriptValue(true)",
@@ -3928,6 +4102,9 @@ static QString lessThan_array[] = {
     "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(0, QString(\"0\")) <=> engine->evaluate(\"Null\")",
@@ -3988,6 +4165,7 @@ static QString lessThan_array[] = {
     "QScriptValue(0, QString(\"123\")) <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(0, QString(\"123\")) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(0, QString(\"123\")) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(0, QString(\"123\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(0, QString(\"123\")) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(0, QString(\"123\")) <=> engine->evaluate(\"Null\")",
     "QScriptValue(0, QString(\"123\")) <=> engine->evaluate(\"True\")",
@@ -4050,6 +4228,8 @@ static QString lessThan_array[] = {
     "QScriptValue(0, QString(\"12.3\")) <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(0, QString(\"12.3\")) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(0, QString(\"12.3\")) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(0, QString(\"12.3\")) <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(0, QString(\"12.3\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(0, QString(\"12.3\")) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(0, QString(\"12.3\")) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(0, QString(\"12.3\")) <=> engine->evaluate(\"Null\")",
@@ -4105,6 +4285,8 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, QScriptValue::NullValue) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(engine, QScriptValue::NullValue) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(engine, QScriptValue::NullValue) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(engine, QScriptValue::NullValue) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(engine, QScriptValue::NullValue) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(engine, QScriptValue::NullValue) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, QScriptValue::NullValue) <=> engine->evaluate(\"true\")",
     "QScriptValue(engine, QScriptValue::NullValue) <=> engine->evaluate(\"122\")",
@@ -4148,6 +4330,7 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, true) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(engine, true) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(engine, true) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(engine, true) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(engine, true) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, true) <=> engine->evaluate(\"122\")",
     "QScriptValue(engine, true) <=> engine->evaluate(\"124\")",
@@ -4195,6 +4378,8 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, false) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(engine, false) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(engine, false) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(engine, false) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(engine, false) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(engine, false) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, false) <=> engine->evaluate(\"true\")",
     "QScriptValue(engine, false) <=> engine->evaluate(\"122\")",
@@ -4232,6 +4417,7 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, int(122)) <=> QScriptValue(engine, qInf())",
     "QScriptValue(engine, int(122)) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(engine, int(122)) <=> QScriptValue(engine, QString(\"123\"))",
+    "QScriptValue(engine, int(122)) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(engine, int(122)) <=> engine->evaluate(\"124\")",
     "QScriptValue(engine, int(122)) <=> engine->evaluate(\"123.0\")",
     "QScriptValue(engine, int(122)) <=> engine->evaluate(\"0x43211234\")",
@@ -4295,6 +4481,8 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, 0) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(engine, 0) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(engine, 0) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(engine, 0) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(engine, 0) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(engine, 0) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, 0) <=> engine->evaluate(\"true\")",
     "QScriptValue(engine, 0) <=> engine->evaluate(\"122\")",
@@ -4344,6 +4532,8 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, 0.0) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(engine, 0.0) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(engine, 0.0) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(engine, 0.0) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(engine, 0.0) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(engine, 0.0) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, 0.0) <=> engine->evaluate(\"true\")",
     "QScriptValue(engine, 0.0) <=> engine->evaluate(\"122\")",
@@ -4413,6 +4603,8 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, 6.37e-8) <=> QScriptValue(engine, \"Infinity\")",
     "QScriptValue(engine, 6.37e-8) <=> QScriptValue(engine, QString(\"123\"))",
     "QScriptValue(engine, 6.37e-8) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "QScriptValue(engine, 6.37e-8) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(engine, 6.37e-8) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(engine, 6.37e-8) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, 6.37e-8) <=> engine->evaluate(\"true\")",
     "QScriptValue(engine, 6.37e-8) <=> engine->evaluate(\"122\")",
@@ -4485,6 +4677,9 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, -6.37e-8) <=> engine->evaluate(\"[]\")",
     "QScriptValue(engine, -6.37e-8) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(engine, -6.37e-8) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(engine, -6.37e-8) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(engine, -6.37e-8) <=> engine->evaluate(\"new Boolean(false)\")",
+    "QScriptValue(engine, -6.37e-8) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(engine, -6.37e-8) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, -6.37e-8) <=> engine->evaluate(\"null\")",
     "QScriptValue(engine, -6.37e-8) <=> engine->evaluate(\"true\")",
@@ -4604,6 +4799,9 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, -qInf()) <=> engine->evaluate(\"[]\")",
     "QScriptValue(engine, -qInf()) <=> engine->evaluate(\"Array.prototype\")",
     "QScriptValue(engine, -qInf()) <=> engine->evaluate(\"new Array()\")",
+    "QScriptValue(engine, -qInf()) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(engine, -qInf()) <=> engine->evaluate(\"new Boolean(false)\")",
+    "QScriptValue(engine, -qInf()) <=> engine->evaluate(\"new Number(123)\")",
     "QScriptValue(engine, -qInf()) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, -qInf()) <=> engine->evaluate(\"null\")",
     "QScriptValue(engine, -qInf()) <=> engine->evaluate(\"true\")",
@@ -4644,6 +4842,7 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, \"NaN\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "QScriptValue(engine, \"NaN\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(engine, \"NaN\") <=> engine->evaluate(\"new Object()\")",
+    "QScriptValue(engine, \"NaN\") <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(engine, \"NaN\") <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(engine, \"NaN\") <=> engine->evaluate(\"Null\")",
     "QScriptValue(engine, \"NaN\") <=> engine->evaluate(\"True\")",
@@ -4671,6 +4870,7 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, \"Infinity\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "QScriptValue(engine, \"Infinity\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(engine, \"Infinity\") <=> engine->evaluate(\"new Object()\")",
+    "QScriptValue(engine, \"Infinity\") <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(engine, \"Infinity\") <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(engine, \"Infinity\") <=> engine->evaluate(\"Null\")",
     "QScriptValue(engine, \"Infinity\") <=> engine->evaluate(\"True\")",
@@ -4755,6 +4955,11 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, \"-Infinity\") <=> engine->evaluate(\"/foo/\")",
     "QScriptValue(engine, \"-Infinity\") <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(engine, \"-Infinity\") <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(engine, \"-Infinity\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(engine, \"-Infinity\") <=> engine->evaluate(\"new Boolean(false)\")",
+    "QScriptValue(engine, \"-Infinity\") <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(engine, \"-Infinity\") <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "QScriptValue(engine, \"-Infinity\") <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(engine, \"-Infinity\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, \"-Infinity\") <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(engine, \"-Infinity\") <=> engine->evaluate(\"Null\")",
@@ -4781,6 +4986,7 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, \"-Infinity\") <=> engine->nullValue()",
     "QScriptValue(engine, \"-Infinity\") <=> engine->newObject()",
     "QScriptValue(engine, \"-Infinity\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "QScriptValue(engine, \"-Infinity\") <=> engine->newRegExp(\"foo\", \"gim\")",
     "QScriptValue(engine, \"-Infinity\") <=> engine->newVariant(QVariant(123))",
     "QScriptValue(engine, \"-Infinity\") <=> engine->newVariant(QVariant(false))",
     "QScriptValue(engine, \"-Infinity\") <=> engine->newQObject(0)",
@@ -4865,6 +5071,10 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"/foo/\")",
     "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(engine, QString(\"\")) <=> engine->evaluate(\"Null\")",
@@ -4886,6 +5096,7 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, QString(\"\")) <=> engine->newObject()",
     "QScriptValue(engine, QString(\"\")) <=> engine->newArray(10)",
     "QScriptValue(engine, QString(\"\")) <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "QScriptValue(engine, QString(\"\")) <=> engine->newRegExp(\"foo\", \"gim\")",
     "QScriptValue(engine, QString(\"\")) <=> engine->newVariant(QVariant(123))",
     "QScriptValue(engine, QString(\"\")) <=> engine->newQObject(engine)",
     "QScriptValue(engine, QString()) <=> QScriptValue(true)",
@@ -4952,6 +5163,10 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, QString()) <=> engine->evaluate(\"/foo/\")",
     "QScriptValue(engine, QString()) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(engine, QString()) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(engine, QString()) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(engine, QString()) <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(engine, QString()) <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "QScriptValue(engine, QString()) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(engine, QString()) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, QString()) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(engine, QString()) <=> engine->evaluate(\"Null\")",
@@ -4973,6 +5188,7 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, QString()) <=> engine->newObject()",
     "QScriptValue(engine, QString()) <=> engine->newArray(10)",
     "QScriptValue(engine, QString()) <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "QScriptValue(engine, QString()) <=> engine->newRegExp(\"foo\", \"gim\")",
     "QScriptValue(engine, QString()) <=> engine->newVariant(QVariant(123))",
     "QScriptValue(engine, QString()) <=> engine->newQObject(engine)",
     "QScriptValue(engine, QString(\"0\")) <=> QScriptValue(true)",
@@ -5032,6 +5248,9 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"new Boolean(true)\")",
+    "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(engine, QString(\"0\")) <=> engine->evaluate(\"Null\")",
@@ -5092,6 +5311,7 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, QString(\"123\")) <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(engine, QString(\"123\")) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(engine, QString(\"123\")) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(engine, QString(\"123\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(engine, QString(\"123\")) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(engine, QString(\"123\")) <=> engine->evaluate(\"Null\")",
     "QScriptValue(engine, QString(\"123\")) <=> engine->evaluate(\"True\")",
@@ -5155,6 +5375,8 @@ static QString lessThan_array[] = {
     "QScriptValue(engine, QString(\"1.23\")) <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "QScriptValue(engine, QString(\"1.23\")) <=> engine->evaluate(\"new Object()\")",
     "QScriptValue(engine, QString(\"1.23\")) <=> engine->evaluate(\"new Error()\")",
+    "QScriptValue(engine, QString(\"1.23\")) <=> engine->evaluate(\"new Number(123)\")",
+    "QScriptValue(engine, QString(\"1.23\")) <=> engine->evaluate(\"new String('ciao')\")",
     "QScriptValue(engine, QString(\"1.23\")) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "QScriptValue(engine, QString(\"1.23\")) <=> engine->evaluate(\"Undefined\")",
     "QScriptValue(engine, QString(\"1.23\")) <=> engine->evaluate(\"Null\")",
@@ -5238,6 +5460,10 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"[]\") <=> engine->evaluate(\"/foo/\")",
     "engine->evaluate(\"[]\") <=> engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"[]\") <=> engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"[]\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"[]\") <=> engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"[]\") <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"[]\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"[]\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"[]\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"[]\") <=> engine->evaluate(\"Null\")",
@@ -5259,6 +5485,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"[]\") <=> engine->newObject()",
     "engine->evaluate(\"[]\") <=> engine->newArray(10)",
     "engine->evaluate(\"[]\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->evaluate(\"[]\") <=> engine->newRegExp(\"foo\", \"gim\")",
     "engine->evaluate(\"[]\") <=> engine->newVariant(QVariant(123))",
     "engine->evaluate(\"[]\") <=> engine->newQObject(engine)",
     "engine->evaluate(\"Object.prototype\") <=> QScriptValue(\"ciao\")",
@@ -5275,6 +5502,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"Object.prototype\") <=> engine->evaluate(\"(function() { return 1; })\")",
     "engine->evaluate(\"Object.prototype\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->evaluate(\"Object.prototype\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
+    "engine->evaluate(\"Object.prototype\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"Object.prototype\") <=> engine->evaluate(\"'ciao'\")",
     "engine->evaluate(\"Object.prototype\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
     "engine->evaluate(\"Array.prototype\") <=> QScriptValue(true)",
@@ -5341,6 +5569,10 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"Array.prototype\") <=> engine->evaluate(\"/foo/\")",
     "engine->evaluate(\"Array.prototype\") <=> engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"Array.prototype\") <=> engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"Array.prototype\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"Array.prototype\") <=> engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"Array.prototype\") <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"Array.prototype\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"Array.prototype\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Array.prototype\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Array.prototype\") <=> engine->evaluate(\"Null\")",
@@ -5362,6 +5594,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"Array.prototype\") <=> engine->newObject()",
     "engine->evaluate(\"Array.prototype\") <=> engine->newArray(10)",
     "engine->evaluate(\"Array.prototype\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->evaluate(\"Array.prototype\") <=> engine->newRegExp(\"foo\", \"gim\")",
     "engine->evaluate(\"Array.prototype\") <=> engine->newVariant(QVariant(123))",
     "engine->evaluate(\"Array.prototype\") <=> engine->newQObject(engine)",
     "engine->evaluate(\"Function.prototype\") <=> engine->evaluate(\"Object\")",
@@ -5393,6 +5626,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"Error.prototype\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->evaluate(\"Error.prototype\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"Error.prototype\") <=> engine->evaluate(\"new Object()\")",
+    "engine->evaluate(\"Error.prototype\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"Error.prototype\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Error.prototype\") <=> engine->evaluate(\"Null\")",
     "engine->evaluate(\"Error.prototype\") <=> engine->evaluate(\"True\")",
@@ -5455,6 +5689,8 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"/foo/\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"/foo/\") <=> engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"/foo/\") <=> engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"/foo/\") <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"/foo/\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"/foo/\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"/foo/\") <=> engine->evaluate(\"Null\")",
     "engine->evaluate(\"/foo/\") <=> engine->evaluate(\"True\")",
@@ -5465,6 +5701,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"/foo/\") <=> engine->evaluate(\"'12.4'\")",
     "engine->evaluate(\"/foo/\") <=> engine->newObject()",
     "engine->evaluate(\"/foo/\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->evaluate(\"/foo/\") <=> engine->newRegExp(\"foo\", \"gim\")",
     "engine->evaluate(\"/foo/\") <=> engine->newQObject(engine)",
     "engine->evaluate(\"new Object()\") <=> QScriptValue(\"ciao\")",
     "engine->evaluate(\"new Object()\") <=> QScriptValue(QString::fromLatin1(\"ciao\"))",
@@ -5480,6 +5717,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"new Object()\") <=> engine->evaluate(\"(function() { return 1; })\")",
     "engine->evaluate(\"new Object()\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->evaluate(\"new Object()\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
+    "engine->evaluate(\"new Object()\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"new Object()\") <=> engine->evaluate(\"'ciao'\")",
     "engine->evaluate(\"new Object()\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
     "engine->evaluate(\"new Array()\") <=> QScriptValue(true)",
@@ -5546,6 +5784,10 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"/foo/\")",
     "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"Null\")",
@@ -5567,6 +5809,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"new Array()\") <=> engine->newObject()",
     "engine->evaluate(\"new Array()\") <=> engine->newArray(10)",
     "engine->evaluate(\"new Array()\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->evaluate(\"new Array()\") <=> engine->newRegExp(\"foo\", \"gim\")",
     "engine->evaluate(\"new Array()\") <=> engine->newVariant(QVariant(123))",
     "engine->evaluate(\"new Array()\") <=> engine->newQObject(engine)",
     "engine->evaluate(\"new Error()\") <=> QScriptValue(\"NaN\")",
@@ -5591,6 +5834,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"new Error()\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->evaluate(\"new Error()\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"new Error()\") <=> engine->evaluate(\"new Object()\")",
+    "engine->evaluate(\"new Error()\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"new Error()\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"new Error()\") <=> engine->evaluate(\"Null\")",
     "engine->evaluate(\"new Error()\") <=> engine->evaluate(\"True\")",
@@ -5599,6 +5843,175 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"new Error()\") <=> engine->newObject()",
     "engine->evaluate(\"new Error()\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
     "engine->evaluate(\"new Error()\") <=> engine->newQObject(engine)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(int(122))",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(uint(124))",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(123.0)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0x43211234)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0x10000)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0x10001)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(qInf())",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(\"Infinity\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(QString(\"123\"))",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(QString(\"12.4\"))",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0, int(122))",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0, uint(124))",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0, 123.0)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0, 0x43211234)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0, 0x10000)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0, 0x10001)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0, qInf())",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0, \"Infinity\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0, QString(\"123\"))",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(0, QString(\"12.3\"))",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(engine, int(122))",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(engine, uint(124))",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(engine, 123.0)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(engine, 0x43211234)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(engine, 0x10000)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(engine, 0x10001)",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(engine, qInf())",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(engine, \"Infinity\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(engine, QString(\"123\"))",
+    "engine->evaluate(\"new Boolean(true)\") <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"122\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"124\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"123.0\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"0x43211234\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"0x10000\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"0x10001\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"Infinity\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"'123'\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"'12.4'\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->newVariant(QVariant(123))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(true)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(int(122))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(uint(124))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(123.0)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(6.37e-8)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0x43211234)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0x10000)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0x10001)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(qInf())",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(\"Infinity\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(QString(\"123\"))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(QString(\"12.4\"))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, true)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, int(122))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, uint(124))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, 123.0)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, 6.37e-8)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, 0x43211234)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, 0x10000)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, 0x10001)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, qInf())",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, \"Infinity\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, QString(\"123\"))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(0, QString(\"12.3\"))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, true)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, int(122))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, uint(124))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, 123.0)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, 6.37e-8)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, 0x43211234)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, 0x10000)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, 0x10001)",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, qInf())",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, \"Infinity\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, QString(\"123\"))",
+    "engine->evaluate(\"new Boolean(false)\") <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"true\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"122\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"124\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"123.0\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"6.37e-8\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"0x43211234\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"0x10000\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"0x10001\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"Infinity\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"'123'\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"'12.4'\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->newVariant(QVariant(123))",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(uint(124))",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(0x43211234)",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(0x10000)",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(0x10001)",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(qInf())",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(\"Infinity\")",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(0, uint(124))",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(0, 0x43211234)",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(0, 0x10000)",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(0, 0x10001)",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(0, qInf())",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(0, \"Infinity\")",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(engine, uint(124))",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(engine, 0x43211234)",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(engine, 0x10000)",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(engine, 0x10001)",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(engine, qInf())",
+    "engine->evaluate(\"new Number(123)\") <=> QScriptValue(engine, \"Infinity\")",
+    "engine->evaluate(\"new Number(123)\") <=> engine->evaluate(\"124\")",
+    "engine->evaluate(\"new Number(123)\") <=> engine->evaluate(\"0x43211234\")",
+    "engine->evaluate(\"new Number(123)\") <=> engine->evaluate(\"0x10000\")",
+    "engine->evaluate(\"new Number(123)\") <=> engine->evaluate(\"0x10001\")",
+    "engine->evaluate(\"new Number(123)\") <=> engine->evaluate(\"Infinity\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(\"NaN\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(\"Infinity\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(\"ciao\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(QString::fromLatin1(\"ciao\"))",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(QString(\"0\"))",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(QString(\"123\"))",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(QString(\"12.4\"))",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(0, \"NaN\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(0, \"Infinity\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(0, \"ciao\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(0, QString::fromLatin1(\"ciao\"))",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(0, QString(\"0\"))",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(0, QString(\"123\"))",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(0, QString(\"12.3\"))",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(engine, \"NaN\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(engine, \"Infinity\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(engine, \"ciao\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(engine, QString::fromLatin1(\"ciao\"))",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(engine, QString(\"0\"))",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(engine, QString(\"123\"))",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"Object.prototype\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"Function.prototype\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"Error.prototype\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"Array\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"Number\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"Function\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"(function() { return 1; })\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"new Object()\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"new String('ciao')\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"Undefined\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"Null\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"True\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"False\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"'ciao'\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"'0'\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"'123'\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"'12.4'\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->newObject()",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->newQObject(engine)",
+    "engine->evaluate(\"new String('ciao')\") <=> engine->evaluate(\"Function.prototype\")",
+    "engine->evaluate(\"new String('ciao')\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"new String('ciao')\") <=> engine->evaluate(\"Array\")",
+    "engine->evaluate(\"new String('ciao')\") <=> engine->evaluate(\"Number\")",
+    "engine->evaluate(\"new String('ciao')\") <=> engine->evaluate(\"Function\")",
+    "engine->evaluate(\"new String('ciao')\") <=> engine->evaluate(\"(function() { return 1; })\")",
+    "engine->evaluate(\"new String('ciao')\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
+    "engine->evaluate(\"new String('ciao')\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\") <=> QScriptValue(int(122))",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\") <=> QScriptValue(uint(124))",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\") <=> QScriptValue(123.0)",
@@ -5626,6 +6039,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\") <=> QScriptValue(engine, qInf())",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\") <=> QScriptValue(engine, \"Infinity\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\") <=> QScriptValue(engine, QString(\"123\"))",
+    "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\") <=> engine->evaluate(\"new Number(123)\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\") <=> engine->evaluate(\"122\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\") <=> engine->evaluate(\"124\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\") <=> engine->evaluate(\"123.0\")",
@@ -5651,6 +6065,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"Undefined\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->evaluate(\"Undefined\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"Undefined\") <=> engine->evaluate(\"new Object()\")",
+    "engine->evaluate(\"Undefined\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"Undefined\") <=> engine->evaluate(\"'ciao'\")",
     "engine->evaluate(\"Undefined\") <=> engine->newObject()",
     "engine->evaluate(\"Undefined\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
@@ -5670,6 +6085,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"Null\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->evaluate(\"Null\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"Null\") <=> engine->evaluate(\"new Object()\")",
+    "engine->evaluate(\"Null\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"Null\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\") <=> engine->evaluate(\"True\")",
     "engine->evaluate(\"Null\") <=> engine->evaluate(\"'ciao'\")",
@@ -5691,6 +6107,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"True\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->evaluate(\"True\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"True\") <=> engine->evaluate(\"new Object()\")",
+    "engine->evaluate(\"True\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"True\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"True\") <=> engine->evaluate(\"'ciao'\")",
     "engine->evaluate(\"True\") <=> engine->newObject()",
@@ -5711,6 +6128,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"False\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->evaluate(\"False\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"False\") <=> engine->evaluate(\"new Object()\")",
+    "engine->evaluate(\"False\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"False\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"False\") <=> engine->evaluate(\"Null\")",
     "engine->evaluate(\"False\") <=> engine->evaluate(\"True\")",
@@ -5753,6 +6171,8 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"null\") <=> QScriptValue(engine, \"Infinity\")",
     "engine->evaluate(\"null\") <=> QScriptValue(engine, QString(\"123\"))",
     "engine->evaluate(\"null\") <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->evaluate(\"null\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"null\") <=> engine->evaluate(\"new Number(123)\")",
     "engine->evaluate(\"null\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"null\") <=> engine->evaluate(\"true\")",
     "engine->evaluate(\"null\") <=> engine->evaluate(\"122\")",
@@ -5796,6 +6216,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"true\") <=> QScriptValue(engine, \"Infinity\")",
     "engine->evaluate(\"true\") <=> QScriptValue(engine, QString(\"123\"))",
     "engine->evaluate(\"true\") <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->evaluate(\"true\") <=> engine->evaluate(\"new Number(123)\")",
     "engine->evaluate(\"true\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"true\") <=> engine->evaluate(\"122\")",
     "engine->evaluate(\"true\") <=> engine->evaluate(\"124\")",
@@ -5843,6 +6264,8 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"false\") <=> QScriptValue(engine, \"Infinity\")",
     "engine->evaluate(\"false\") <=> QScriptValue(engine, QString(\"123\"))",
     "engine->evaluate(\"false\") <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->evaluate(\"false\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"false\") <=> engine->evaluate(\"new Number(123)\")",
     "engine->evaluate(\"false\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"false\") <=> engine->evaluate(\"true\")",
     "engine->evaluate(\"false\") <=> engine->evaluate(\"122\")",
@@ -5880,6 +6303,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"122\") <=> QScriptValue(engine, qInf())",
     "engine->evaluate(\"122\") <=> QScriptValue(engine, \"Infinity\")",
     "engine->evaluate(\"122\") <=> QScriptValue(engine, QString(\"123\"))",
+    "engine->evaluate(\"122\") <=> engine->evaluate(\"new Number(123)\")",
     "engine->evaluate(\"122\") <=> engine->evaluate(\"124\")",
     "engine->evaluate(\"122\") <=> engine->evaluate(\"123.0\")",
     "engine->evaluate(\"122\") <=> engine->evaluate(\"0x43211234\")",
@@ -5943,6 +6367,8 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"0\") <=> QScriptValue(engine, \"Infinity\")",
     "engine->evaluate(\"0\") <=> QScriptValue(engine, QString(\"123\"))",
     "engine->evaluate(\"0\") <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->evaluate(\"0\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"0\") <=> engine->evaluate(\"new Number(123)\")",
     "engine->evaluate(\"0\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"0\") <=> engine->evaluate(\"true\")",
     "engine->evaluate(\"0\") <=> engine->evaluate(\"122\")",
@@ -5992,6 +6418,8 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"0.0\") <=> QScriptValue(engine, \"Infinity\")",
     "engine->evaluate(\"0.0\") <=> QScriptValue(engine, QString(\"123\"))",
     "engine->evaluate(\"0.0\") <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->evaluate(\"0.0\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"0.0\") <=> engine->evaluate(\"new Number(123)\")",
     "engine->evaluate(\"0.0\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"0.0\") <=> engine->evaluate(\"true\")",
     "engine->evaluate(\"0.0\") <=> engine->evaluate(\"122\")",
@@ -6061,6 +6489,8 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"6.37e-8\") <=> QScriptValue(engine, \"Infinity\")",
     "engine->evaluate(\"6.37e-8\") <=> QScriptValue(engine, QString(\"123\"))",
     "engine->evaluate(\"6.37e-8\") <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->evaluate(\"6.37e-8\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"6.37e-8\") <=> engine->evaluate(\"new Number(123)\")",
     "engine->evaluate(\"6.37e-8\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"6.37e-8\") <=> engine->evaluate(\"true\")",
     "engine->evaluate(\"6.37e-8\") <=> engine->evaluate(\"122\")",
@@ -6133,6 +6563,9 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"-6.37e-8\") <=> engine->evaluate(\"[]\")",
     "engine->evaluate(\"-6.37e-8\") <=> engine->evaluate(\"Array.prototype\")",
     "engine->evaluate(\"-6.37e-8\") <=> engine->evaluate(\"new Array()\")",
+    "engine->evaluate(\"-6.37e-8\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"-6.37e-8\") <=> engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"-6.37e-8\") <=> engine->evaluate(\"new Number(123)\")",
     "engine->evaluate(\"-6.37e-8\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"-6.37e-8\") <=> engine->evaluate(\"null\")",
     "engine->evaluate(\"-6.37e-8\") <=> engine->evaluate(\"true\")",
@@ -6252,6 +6685,9 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"-Infinity\") <=> engine->evaluate(\"[]\")",
     "engine->evaluate(\"-Infinity\") <=> engine->evaluate(\"Array.prototype\")",
     "engine->evaluate(\"-Infinity\") <=> engine->evaluate(\"new Array()\")",
+    "engine->evaluate(\"-Infinity\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"-Infinity\") <=> engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"-Infinity\") <=> engine->evaluate(\"new Number(123)\")",
     "engine->evaluate(\"-Infinity\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"-Infinity\") <=> engine->evaluate(\"null\")",
     "engine->evaluate(\"-Infinity\") <=> engine->evaluate(\"true\")",
@@ -6348,6 +6784,10 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"''\") <=> engine->evaluate(\"/foo/\")",
     "engine->evaluate(\"''\") <=> engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"''\") <=> engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"''\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"''\") <=> engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"''\") <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"''\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"''\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"''\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"''\") <=> engine->evaluate(\"Null\")",
@@ -6369,6 +6809,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"''\") <=> engine->newObject()",
     "engine->evaluate(\"''\") <=> engine->newArray(10)",
     "engine->evaluate(\"''\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->evaluate(\"''\") <=> engine->newRegExp(\"foo\", \"gim\")",
     "engine->evaluate(\"''\") <=> engine->newVariant(QVariant(123))",
     "engine->evaluate(\"''\") <=> engine->newQObject(engine)",
     "engine->evaluate(\"'0'\") <=> QScriptValue(true)",
@@ -6428,6 +6869,9 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"'0'\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"'0'\") <=> engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"'0'\") <=> engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"'0'\") <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"'0'\") <=> engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"'0'\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"'0'\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"'0'\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"'0'\") <=> engine->evaluate(\"Null\")",
@@ -6488,6 +6932,7 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"'123'\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"'123'\") <=> engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"'123'\") <=> engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"'123'\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"'123'\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"'123'\") <=> engine->evaluate(\"Null\")",
     "engine->evaluate(\"'123'\") <=> engine->evaluate(\"True\")",
@@ -6549,6 +6994,8 @@ static QString lessThan_array[] = {
     "engine->evaluate(\"'12.4'\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"'12.4'\") <=> engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"'12.4'\") <=> engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"'12.4'\") <=> engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"'12.4'\") <=> engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"'12.4'\") <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"'12.4'\") <=> engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"'12.4'\") <=> engine->evaluate(\"Null\")",
@@ -6603,6 +7050,8 @@ static QString lessThan_array[] = {
     "engine->nullValue() <=> QScriptValue(engine, \"Infinity\")",
     "engine->nullValue() <=> QScriptValue(engine, QString(\"123\"))",
     "engine->nullValue() <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->nullValue() <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->nullValue() <=> engine->evaluate(\"new Number(123)\")",
     "engine->nullValue() <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->nullValue() <=> engine->evaluate(\"true\")",
     "engine->nullValue() <=> engine->evaluate(\"122\")",
@@ -6630,6 +7079,7 @@ static QString lessThan_array[] = {
     "engine->newObject() <=> engine->evaluate(\"(function() { return 1; })\")",
     "engine->newObject() <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->newObject() <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
+    "engine->newObject() <=> engine->evaluate(\"new String('ciao')\")",
     "engine->newObject() <=> engine->evaluate(\"'ciao'\")",
     "engine->newObject() <=> engine->newQMetaObject(&QObject::staticMetaObject)",
     "engine->newArray() <=> QScriptValue(true)",
@@ -6696,6 +7146,10 @@ static QString lessThan_array[] = {
     "engine->newArray() <=> engine->evaluate(\"/foo/\")",
     "engine->newArray() <=> engine->evaluate(\"new Object()\")",
     "engine->newArray() <=> engine->evaluate(\"new Error()\")",
+    "engine->newArray() <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->newArray() <=> engine->evaluate(\"new Number(123)\")",
+    "engine->newArray() <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->newArray() <=> engine->evaluate(\"new String('ciao')\")",
     "engine->newArray() <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->newArray() <=> engine->evaluate(\"Undefined\")",
     "engine->newArray() <=> engine->evaluate(\"Null\")",
@@ -6717,6 +7171,7 @@ static QString lessThan_array[] = {
     "engine->newArray() <=> engine->newObject()",
     "engine->newArray() <=> engine->newArray(10)",
     "engine->newArray() <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newArray() <=> engine->newRegExp(\"foo\", \"gim\")",
     "engine->newArray() <=> engine->newVariant(QVariant(123))",
     "engine->newArray() <=> engine->newQObject(engine)",
     "engine->newArray(10) <=> QScriptValue(\"NaN\")",
@@ -6756,6 +7211,8 @@ static QString lessThan_array[] = {
     "engine->newArray(10) <=> engine->evaluate(\"/foo/\")",
     "engine->newArray(10) <=> engine->evaluate(\"new Object()\")",
     "engine->newArray(10) <=> engine->evaluate(\"new Error()\")",
+    "engine->newArray(10) <=> engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->newArray(10) <=> engine->evaluate(\"new String('ciao')\")",
     "engine->newArray(10) <=> engine->evaluate(\"Undefined\")",
     "engine->newArray(10) <=> engine->evaluate(\"Null\")",
     "engine->newArray(10) <=> engine->evaluate(\"True\")",
@@ -6766,6 +7223,7 @@ static QString lessThan_array[] = {
     "engine->newArray(10) <=> engine->evaluate(\"'12.4'\")",
     "engine->newArray(10) <=> engine->newObject()",
     "engine->newArray(10) <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newArray(10) <=> engine->newRegExp(\"foo\", \"gim\")",
     "engine->newArray(10) <=> engine->newQObject(engine)",
     "engine->newQMetaObject(&QObject::staticMetaObject) <=> QScriptValue(\"ciao\")",
     "engine->newQMetaObject(&QObject::staticMetaObject) <=> QScriptValue(QString::fromLatin1(\"ciao\"))",
@@ -6781,7 +7239,53 @@ static QString lessThan_array[] = {
     "engine->newQMetaObject(&QObject::staticMetaObject) <=> engine->evaluate(\"(function() { return 1; })\")",
     "engine->newQMetaObject(&QObject::staticMetaObject) <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->newQMetaObject(&QObject::staticMetaObject) <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
+    "engine->newQMetaObject(&QObject::staticMetaObject) <=> engine->evaluate(\"new String('ciao')\")",
     "engine->newQMetaObject(&QObject::staticMetaObject) <=> engine->evaluate(\"'ciao'\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(\"NaN\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(\"Infinity\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(\"ciao\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(QString::fromLatin1(\"ciao\"))",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(QString(\"0\"))",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(QString(\"123\"))",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(QString(\"12.4\"))",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(0, \"NaN\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(0, \"Infinity\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(0, \"ciao\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(0, QString::fromLatin1(\"ciao\"))",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(0, QString(\"0\"))",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(0, QString(\"123\"))",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(0, QString(\"12.3\"))",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(engine, \"NaN\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(engine, \"Infinity\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(engine, \"ciao\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(engine, QString::fromLatin1(\"ciao\"))",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(engine, QString(\"0\"))",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(engine, QString(\"123\"))",
+    "engine->newRegExp(\"foo\", \"gim\") <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"Object.prototype\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"Function.prototype\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"Error.prototype\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"Object\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"Array\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"Number\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"Function\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"(function() { return 1; })\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"new Object()\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"new Error()\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"new String('ciao')\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"Undefined\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"Null\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"True\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"False\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"'ciao'\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"'0'\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"'123'\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"'12.4'\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->newObject()",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->newQObject(engine)",
     "engine->newVariant(QVariant(123)) <=> QScriptValue(uint(124))",
     "engine->newVariant(QVariant(123)) <=> QScriptValue(0x43211234)",
     "engine->newVariant(QVariant(123)) <=> QScriptValue(0x10000)",
@@ -6841,6 +7345,8 @@ static QString lessThan_array[] = {
     "engine->newVariant(QVariant(false)) <=> QScriptValue(engine, \"Infinity\")",
     "engine->newVariant(QVariant(false)) <=> QScriptValue(engine, QString(\"123\"))",
     "engine->newVariant(QVariant(false)) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->newVariant(QVariant(false)) <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->newVariant(QVariant(false)) <=> engine->evaluate(\"new Number(123)\")",
     "engine->newVariant(QVariant(false)) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->newVariant(QVariant(false)) <=> engine->evaluate(\"true\")",
     "engine->newVariant(QVariant(false)) <=> engine->evaluate(\"122\")",
@@ -6890,6 +7396,8 @@ static QString lessThan_array[] = {
     "engine->newQObject(0) <=> QScriptValue(engine, \"Infinity\")",
     "engine->newQObject(0) <=> QScriptValue(engine, QString(\"123\"))",
     "engine->newQObject(0) <=> QScriptValue(engine, QString(\"1.23\"))",
+    "engine->newQObject(0) <=> engine->evaluate(\"new Boolean(true)\")",
+    "engine->newQObject(0) <=> engine->evaluate(\"new Number(123)\")",
     "engine->newQObject(0) <=> engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->newQObject(0) <=> engine->evaluate(\"true\")",
     "engine->newQObject(0) <=> engine->evaluate(\"122\")",
@@ -6919,6 +7427,7 @@ static QString lessThan_array[] = {
     "engine->newQObject(engine) <=> engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->newQObject(engine) <=> engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->newQObject(engine) <=> engine->evaluate(\"new Object()\")",
+    "engine->newQObject(engine) <=> engine->evaluate(\"new String('ciao')\")",
     "engine->newQObject(engine) <=> engine->evaluate(\"Undefined\")",
     "engine->newQObject(engine) <=> engine->evaluate(\"Null\")",
     "engine->newQObject(engine) <=> engine->evaluate(\"True\")",
@@ -6931,8 +7440,8 @@ void tst_QScriptValueGenerated::lessThan_makeData(const char *expr)
 {
     static QSet<QString> equals;
     if (equals.isEmpty()) {
-        equals.reserve(5063);
-        for (unsigned i = 0; i < 5063; ++i)
+        equals.reserve(5476);
+        for (unsigned i = 0; i < 5476; ++i)
             equals.insert(lessThan_array[i]);
     }
     QHash<QString, QScriptValue>::const_iterator it;
@@ -6985,6 +7494,12 @@ static QString instanceOf_array[] = {
     "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"Object\")",
     "engine->evaluate(\"new Array()\") <=> engine->evaluate(\"Array\")",
     "engine->evaluate(\"new Error()\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"new Boolean(true)\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"new Boolean(false)\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"new Number(123)\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"new Number(123)\") <=> engine->evaluate(\"Number\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\") <=> engine->evaluate(\"Object\")",
+    "engine->evaluate(\"new String('ciao')\") <=> engine->evaluate(\"Object\")",
     "engine->evaluate(\"Undefined\") <=> engine->evaluate(\"Object\")",
     "engine->evaluate(\"Null\") <=> engine->evaluate(\"Object\")",
     "engine->evaluate(\"True\") <=> engine->evaluate(\"Object\")",
@@ -6996,6 +7511,7 @@ static QString instanceOf_array[] = {
     "engine->newArray(10) <=> engine->evaluate(\"Array\")",
     "engine->newDate(QDateTime()) <=> engine->evaluate(\"Object\")",
     "engine->newQMetaObject(&QObject::staticMetaObject) <=> engine->evaluate(\"Object\")",
+    "engine->newRegExp(\"foo\", \"gim\") <=> engine->evaluate(\"Object\")",
     "engine->newVariant(QVariant()) <=> engine->evaluate(\"Object\")",
     "engine->newVariant(QVariant(123)) <=> engine->evaluate(\"Object\")",
     "engine->newVariant(QVariant(false)) <=> engine->evaluate(\"Object\")",
@@ -7005,8 +7521,8 @@ void tst_QScriptValueGenerated::instanceOf_makeData(const char *expr)
 {
     static QSet<QString> equals;
     if (equals.isEmpty()) {
-        equals.reserve(40);
-        for (unsigned i = 0; i < 40; ++i)
+        equals.reserve(47);
+        for (unsigned i = 0; i < 47; ++i)
             equals.insert(instanceOf_array[i]);
     }
     QHash<QString, QScriptValue>::const_iterator it;
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp
index 77b58ef073..ae40684a51 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp
@@ -155,6 +155,11 @@ void tst_QScriptValueGenerated::initScriptValues()
     DEFINE_TEST_VALUE(engine->evaluate("new Object()"));
     DEFINE_TEST_VALUE(engine->evaluate("new Array()"));
     DEFINE_TEST_VALUE(engine->evaluate("new Error()"));
+    DEFINE_TEST_VALUE(engine->evaluate("new Boolean(true)"));
+    DEFINE_TEST_VALUE(engine->evaluate("new Boolean(false)"));
+    DEFINE_TEST_VALUE(engine->evaluate("new Number(123)"));
+    DEFINE_TEST_VALUE(engine->evaluate("new RegExp('foo', 'gim')"));
+    DEFINE_TEST_VALUE(engine->evaluate("new String('ciao')"));
     DEFINE_TEST_VALUE(engine->evaluate("a = new Object(); a.foo = 22; a.foo"));
     DEFINE_TEST_VALUE(engine->evaluate("Undefined"));
     DEFINE_TEST_VALUE(engine->evaluate("Null"));
@@ -189,6 +194,7 @@ void tst_QScriptValueGenerated::initScriptValues()
     DEFINE_TEST_VALUE(engine->newArray(10));
     DEFINE_TEST_VALUE(engine->newDate(QDateTime()));
     DEFINE_TEST_VALUE(engine->newQMetaObject(&QObject::staticMetaObject));
+    DEFINE_TEST_VALUE(engine->newRegExp("foo", "gim"));
     DEFINE_TEST_VALUE(engine->newVariant(QVariant()));
     DEFINE_TEST_VALUE(engine->newVariant(QVariant(123)));
     DEFINE_TEST_VALUE(engine->newVariant(QVariant(false)));
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp
index 70ccb17957..26b8c62451 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp
@@ -155,6 +155,11 @@ static QString isValid_array[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -189,6 +194,7 @@ static QString isValid_array[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -200,8 +206,8 @@ void tst_QScriptValueGenerated::isValid_makeData(const char* expr)
 {
     static QSet<QString> isValid;
     if (isValid.isEmpty()) {
-        isValid.reserve(141);
-        for (unsigned i = 0; i < 141; ++i)
+        isValid.reserve(147);
+        for (unsigned i = 0; i < 147; ++i)
             isValid.insert(isValid_array[i]);
     }
     newRow(expr) << isValid.contains(expr);
@@ -395,15 +401,17 @@ static QString isFunction_array[] = {
     "engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"/foo/\")",
-    "engine->newQMetaObject(&QObject::staticMetaObject)"
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")"
 };
 
 void tst_QScriptValueGenerated::isFunction_makeData(const char* expr)
 {
     static QSet<QString> isFunction;
     if (isFunction.isEmpty()) {
-        isFunction.reserve(10);
-        for (unsigned i = 0; i < 10; ++i)
+        isFunction.reserve(12);
+        for (unsigned i = 0; i < 12; ++i)
             isFunction.insert(isFunction_array[i]);
     }
     newRow(expr) << isFunction.contains(expr);
@@ -675,6 +683,11 @@ static QString isObject_array[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
     "engine->evaluate(\"True\")",
@@ -684,6 +697,7 @@ static QString isObject_array[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -694,8 +708,8 @@ void tst_QScriptValueGenerated::isObject_makeData(const char* expr)
 {
     static QSet<QString> isObject;
     if (isObject.isEmpty()) {
-        isObject.reserve(30);
-        for (unsigned i = 0; i < 30; ++i)
+        isObject.reserve(36);
+        for (unsigned i = 0; i < 36; ++i)
             isObject.insert(isObject_array[i]);
     }
     newRow(expr) << isObject.contains(expr);
@@ -750,15 +764,17 @@ void tst_QScriptValueGenerated::isRegExp_initData()
 }
 
 static QString isRegExp_array[] = {
-    "engine->evaluate(\"/foo/\")"
+    "engine->evaluate(\"/foo/\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->newRegExp(\"foo\", \"gim\")"
 };
 
 void tst_QScriptValueGenerated::isRegExp_makeData(const char* expr)
 {
     static QSet<QString> isRegExp;
     if (isRegExp.isEmpty()) {
-        isRegExp.reserve(1);
-        for (unsigned i = 0; i < 1; ++i)
+        isRegExp.reserve(3);
+        for (unsigned i = 0; i < 3; ++i)
             isRegExp.insert(isRegExp_array[i]);
     }
     newRow(expr) << isRegExp.contains(expr);
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp
index 4abfe22a5a..e663645a35 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp
@@ -157,6 +157,11 @@ static QString toString_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -191,6 +196,7 @@ static QString toString_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -249,24 +255,27 @@ static QString toString_valueArray[] = {
     "function () { return 1; }", "function () { return 'ciao'; }",
     "function () { throw new Error('foo'); }", "/foo/",
     "[object Object]", "",
-    "Error: Unknown error", "22",
-    "ReferenceError: Can't find variable: Undefined", "ReferenceError: Can't find variable: Null",
-    "ReferenceError: Can't find variable: True", "ReferenceError: Can't find variable: False",
-    "undefined", "null",
-    "true", "false",
-    "122", "124",
-    "0", "0",
-    "123", "6.37e-8",
-    "-6.37e-8", "1126240820",
-    "65536", "65537",
-    "NaN", "Infinity",
-    "-Infinity", "ciao",
-    "", "0",
-    "123", "12.4",
-    "null", "undefined",
-    "[object Object]", "",
-    ",,,,,,,,,", "Invalid Date",
-    "[object QMetaObject]", "undefined",
+    "Error: Unknown error", "true",
+    "false", "123",
+    "/foo/gim", "ciao",
+    "22", "ReferenceError: Can't find variable: Undefined",
+    "ReferenceError: Can't find variable: Null", "ReferenceError: Can't find variable: True",
+    "ReferenceError: Can't find variable: False", "undefined",
+    "null", "true",
+    "false", "122",
+    "124", "0",
+    "0", "123",
+    "6.37e-8", "-6.37e-8",
+    "1126240820", "65536",
+    "65537", "NaN",
+    "Infinity", "-Infinity",
+    "ciao", "",
+    "0", "123",
+    "12.4", "null",
+    "undefined", "[object Object]",
+    "", ",,,,,,,,,",
+    "Invalid Date", "[object QMetaObject]",
+    "/foo/gim", "undefined",
     "123", "false",
     "null", "QScriptEngine(name = \"\")"};
 
@@ -274,8 +283,8 @@ void tst_QScriptValueGenerated::toString_makeData(const char* expr)
 {
     static QHash<QString, QString> toString;
     if (toString.isEmpty()) {
-        toString.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        toString.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             toString.insert(toString_tagArray[i], toString_valueArray[i]);
     }
     newRow(expr) << toString.value(expr);
@@ -401,6 +410,11 @@ static QString toNumber_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -435,6 +449,7 @@ static QString toNumber_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -451,17 +466,17 @@ static qsreal toNumber_valueArray[] = {
     65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(), qInf(), qInf(), qQNaN(), qQNaN(),
     0, 0, 0, 123, 1.23, 0, qQNaN(), qQNaN(), qQNaN(), 0,
     qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(),
-    qQNaN(), 0, qQNaN(), 22, qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), 0,
-    1, 0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 1126240820,
-    65536, 65537, qQNaN(), qInf(), qInf(), qQNaN(), 0, 0, 123, 12.4,
-    0, qQNaN(), qQNaN(), 0, qQNaN(), qQNaN(), qQNaN(), qQNaN(), 123, 0,
-    0, qQNaN()};
+    qQNaN(), 0, qQNaN(), 1, 0, 123, qQNaN(), qQNaN(), 22, qQNaN(),
+    qQNaN(), qQNaN(), qQNaN(), qQNaN(), 0, 1, 0, 122, 124, 0,
+    0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 1126240820, 65536, 65537, qQNaN(), qInf(), qInf(),
+    qQNaN(), 0, 0, 123, 12.4, 0, qQNaN(), qQNaN(), 0, qQNaN(),
+    qQNaN(), qQNaN(), qQNaN(), qQNaN(), 123, 0, 0, qQNaN()};
 void tst_QScriptValueGenerated::toNumber_makeData(const char* expr)
 {
     static QHash<QString, qsreal> toNumber;
     if (toNumber.isEmpty()) {
-        toNumber.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        toNumber.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             toNumber.insert(toNumber_tagArray[i], toNumber_valueArray[i]);
     }
     newRow(expr) << toNumber.value(expr);
@@ -596,6 +611,11 @@ static QString toBool_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -630,6 +650,7 @@ static QString toBool_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -691,18 +712,21 @@ static bool toBool_valueArray[] = {
     true, true,
     true, true,
     true, true,
-    false, false,
-    true, false,
     true, true,
-    false, false,
     true, true,
+    true, false,
+    false, true,
+    false, true,
+    true, false,
+    false, true,
     true, true,
     true, true,
-    false, true,
+    true, false,
     true, true,
-    false, true,
+    true, false,
     true, true,
-    false, false,
+    true, false,
+    false, true,
     true, true,
     true, true,
     true, true,
@@ -713,8 +737,8 @@ void tst_QScriptValueGenerated::toBool_makeData(const char* expr)
 {
     static QHash<QString, bool> toBool;
     if (toBool.isEmpty()) {
-        toBool.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        toBool.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             toBool.insert(toBool_tagArray[i], toBool_valueArray[i]);
     }
     newRow(expr) << toBool.value(expr);
@@ -840,6 +864,11 @@ static QString toBoolean_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -874,6 +903,7 @@ static QString toBoolean_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -935,18 +965,21 @@ static bool toBoolean_valueArray[] = {
     true, true,
     true, true,
     true, true,
-    false, false,
-    true, false,
     true, true,
-    false, false,
     true, true,
+    true, false,
+    false, true,
+    false, true,
+    true, false,
+    false, true,
     true, true,
     true, true,
-    false, true,
+    true, false,
     true, true,
-    false, true,
+    true, false,
     true, true,
-    false, false,
+    true, false,
+    false, true,
     true, true,
     true, true,
     true, true,
@@ -957,8 +990,8 @@ void tst_QScriptValueGenerated::toBoolean_makeData(const char* expr)
 {
     static QHash<QString, bool> toBoolean;
     if (toBoolean.isEmpty()) {
-        toBoolean.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        toBoolean.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             toBoolean.insert(toBoolean_tagArray[i], toBoolean_valueArray[i]);
     }
     newRow(expr) << toBoolean.value(expr);
@@ -1084,6 +1117,11 @@ static QString toInteger_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -1118,6 +1156,7 @@ static QString toInteger_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -1134,17 +1173,17 @@ static qsreal toInteger_valueArray[] = {
     65537, 0, 0, qInf(), qInf(), 0, qInf(), qInf(), 0, 0,
     0, 0, 0, 123, 1, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    0, 0, 0, 22, 0, 0, 0, 0, 0, 0,
-    1, 0, 122, 124, 0, 0, 123, 0, 0, 1126240820,
-    65536, 65537, 0, qInf(), qInf(), 0, 0, 0, 123, 12,
-    0, 0, 0, 0, 0, 0, 0, 0, 123, 0,
-    0, 0};
+    0, 0, 0, 1, 0, 123, 0, 0, 22, 0,
+    0, 0, 0, 0, 0, 1, 0, 122, 124, 0,
+    0, 123, 0, 0, 1126240820, 65536, 65537, 0, qInf(), qInf(),
+    0, 0, 0, 123, 12, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 123, 0, 0, 0};
 void tst_QScriptValueGenerated::toInteger_makeData(const char* expr)
 {
     static QHash<QString, qsreal> toInteger;
     if (toInteger.isEmpty()) {
-        toInteger.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        toInteger.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             toInteger.insert(toInteger_tagArray[i], toInteger_valueArray[i]);
     }
     newRow(expr) << toInteger.value(expr);
@@ -1275,6 +1314,11 @@ static QString toInt32_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -1309,6 +1353,7 @@ static QString toInt32_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -1367,20 +1412,23 @@ static qint32 toInt32_valueArray[] = {
     0, 0,
     0, 0,
     0, 0,
-    0, 22,
-    0, 0,
+    0, 1,
+    0, 123,
     0, 0,
+    22, 0,
     0, 0,
-    1, 0,
-    122, 124,
     0, 0,
-    123, 0,
-    0, 1126240820,
-    65536, 65537,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
     0, 0,
+    1126240820, 65536,
+    65537, 0,
     0, 0,
     0, 0,
-    123, 12,
+    0, 123,
+    12, 0,
     0, 0,
     0, 0,
     0, 0,
@@ -1392,8 +1440,8 @@ void tst_QScriptValueGenerated::toInt32_makeData(const char* expr)
 {
     static QHash<QString, qint32> toInt32;
     if (toInt32.isEmpty()) {
-        toInt32.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        toInt32.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             toInt32.insert(toInt32_tagArray[i], toInt32_valueArray[i]);
     }
     newRow(expr) << toInt32.value(expr);
@@ -1519,6 +1567,11 @@ static QString toUInt32_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -1553,6 +1606,7 @@ static QString toUInt32_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -1611,20 +1665,23 @@ static quint32 toUInt32_valueArray[] = {
     0, 0,
     0, 0,
     0, 0,
-    0, 22,
+    0, 1,
+    0, 123,
     0, 0,
+    22, 0,
     0, 0,
     0, 0,
-    1, 0,
-    122, 124,
-    0, 0,
-    123, 0,
-    0, 1126240820,
-    65536, 65537,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
     0, 0,
+    1126240820, 65536,
+    65537, 0,
     0, 0,
     0, 0,
-    123, 12,
+    0, 123,
+    12, 0,
     0, 0,
     0, 0,
     0, 0,
@@ -1636,8 +1693,8 @@ void tst_QScriptValueGenerated::toUInt32_makeData(const char* expr)
 {
     static QHash<QString, quint32> toUInt32;
     if (toUInt32.isEmpty()) {
-        toUInt32.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        toUInt32.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             toUInt32.insert(toUInt32_tagArray[i], toUInt32_valueArray[i]);
     }
     newRow(expr) << toUInt32.value(expr);
@@ -1763,6 +1820,11 @@ static QString toUInt16_tagArray[] = {
     "engine->evaluate(\"new Object()\")",
     "engine->evaluate(\"new Array()\")",
     "engine->evaluate(\"new Error()\")",
+    "engine->evaluate(\"new Boolean(true)\")",
+    "engine->evaluate(\"new Boolean(false)\")",
+    "engine->evaluate(\"new Number(123)\")",
+    "engine->evaluate(\"new RegExp('foo', 'gim')\")",
+    "engine->evaluate(\"new String('ciao')\")",
     "engine->evaluate(\"a = new Object(); a.foo = 22; a.foo\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
@@ -1797,6 +1859,7 @@ static QString toUInt16_tagArray[] = {
     "engine->newArray(10)",
     "engine->newDate(QDateTime())",
     "engine->newQMetaObject(&QObject::staticMetaObject)",
+    "engine->newRegExp(\"foo\", \"gim\")",
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
@@ -1855,20 +1918,23 @@ static quint16 toUInt16_valueArray[] = {
     0, 0,
     0, 0,
     0, 0,
-    0, 22,
-    0, 0,
+    0, 1,
+    0, 123,
     0, 0,
+    22, 0,
     0, 0,
-    1, 0,
-    122, 124,
     0, 0,
-    123, 0,
-    0, 4660,
     0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
     0, 0,
+    4660, 0,
+    1, 0,
     0, 0,
     0, 0,
-    123, 12,
+    0, 123,
+    12, 0,
     0, 0,
     0, 0,
     0, 0,
@@ -1880,8 +1946,8 @@ void tst_QScriptValueGenerated::toUInt16_makeData(const char* expr)
 {
     static QHash<QString, quint16> toUInt16;
     if (toUInt16.isEmpty()) {
-        toUInt16.reserve(142);
-        for (unsigned i = 0; i < 142; ++i)
+        toUInt16.reserve(148);
+        for (unsigned i = 0; i < 148; ++i)
             toUInt16.insert(toUInt16_tagArray[i], toUInt16_valueArray[i]);
     }
     newRow(expr) << toUInt16.value(expr);