Remove the use of the QWidgetStar metatypeid.

It is to be removed, and is obsoleted by QMetaType::PointerToQObject.
By using QMetaType::PointerToQObject, we also gain the feature
that all pointers to types derived from QObject return true for
QScriptValue::isQObject().

Change-Id: I18392b5b6cde3a45d060c37612d987a5cf8e8f18
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
index 9706901..c6fab3d 100644
--- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
+++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
@@ -1533,7 +1533,6 @@ void tst_QScriptExtQObject::callQtInvokable4()
         QCOMPARE(m_myObject->qtFunctionInvoked(), 63);
         QCOMPARE(m_myObject->qtFunctionActuals().size(), 1);
         QVariant v = m_myObject->qtFunctionActuals().at(0);
-        QCOMPARE(v.userType(), int(QMetaType::QWidgetStar));
         QCOMPARE(qvariant_cast<QWidget*>(v), (QObject *)0);
     }
 
@@ -1702,7 +1701,7 @@ void tst_QScriptExtQObject::callQtInvokable5()
     {
         QScriptValue ret = m_engine->evaluate("myObject.myInvokableReturningMyQObject()");
         QCOMPARE(m_myObject->qtFunctionInvoked(), 53);
-        QVERIFY(ret.isVariant());
+        QVERIFY(ret.isQObject());
         QCOMPARE(*reinterpret_cast<MyQObject* const *>(ret.toVariant().constData()), m_myObject);
     }