diff options
Diffstat (limited to 'tests')
5 files changed, 11 insertions, 40 deletions
diff --git a/tests/auto/qml/qqmlecmascript/data/moduleapi/qobjectModuleApiLegacy.qml b/tests/auto/qml/qqmlecmascript/data/moduleapi/qobjectModuleApiLegacy.qml deleted file mode 100644 index e282ad64f2..0000000000 --- a/tests/auto/qml/qqmlecmascript/data/moduleapi/qobjectModuleApiLegacy.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 - -import Qt.test.legacyModuleApi 1.0 as ModApi // was registered with non-templated function - -QtObject { - property int legacyModulePropertyTest: ModApi.qobjectTestProperty - property int legacyModuleMethodTest - - Component.onCompleted: { - legacyModuleMethodTest = ModApi.qobjectTestMethod(); - } -} - diff --git a/tests/auto/qml/qqmlecmascript/testtypes.cpp b/tests/auto/qml/qqmlecmascript/testtypes.cpp index 8fd160513c..f192cbc6c6 100644 --- a/tests/auto/qml/qqmlecmascript/testtypes.cpp +++ b/tests/auto/qml/qqmlecmascript/testtypes.cpp @@ -218,7 +218,6 @@ void registerTypes() qmlRegisterModuleApi<testQObjectApi>("Qt.test.qobjectApi",1,3,qobject_api); // register (qobject) module API for a uri which doesn't contain elements, minor version set qmlRegisterModuleApi<testQObjectApi>("Qt.test.qobjectApi",2,0,qobject_api); // register (qobject) module API for a uri which doesn't contain elements, major version set qmlRegisterModuleApi<testQObjectApi>("Qt.test.qobjectApiParented",1,0,qobject_api_engine_parent); // register (parented qobject) module API for a uri which doesn't contain elements - qmlRegisterModuleApi("Qt.test.legacyModuleApi", 1, 0, qobject_api); // this registration function doesn't provide type information. qRegisterMetaType<MyQmlObject::MyEnum2>("MyEnum2"); qRegisterMetaType<Qt::MouseButtons>("Qt::MouseButtons"); diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index 2db8967084..9f4a8576d7 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -3606,17 +3606,6 @@ void tst_qqmlecmascript::moduleApi_data() << QVariantList() << QStringList() << QVariantList(); - - QTest::newRow("legacy module api registration") - << testFileUrl("moduleapi/qobjectModuleApiLegacy.qml") - << QString() - << QStringList() // warning doesn't occur in the test, but in registerTypes() - << (QStringList() << "legacyModulePropertyTest" << "legacyModuleMethodTest") - << (QVariantList() << 20 << 2) - << QStringList() - << QVariantList() - << QStringList() - << QVariantList(); } void tst_qqmlecmascript::moduleApi() diff --git a/tests/benchmarks/qml/holistic/testtypes.cpp b/tests/benchmarks/qml/holistic/testtypes.cpp index 65d3ee8522..bf9ff5f34e 100644 --- a/tests/benchmarks/qml/holistic/testtypes.cpp +++ b/tests/benchmarks/qml/holistic/testtypes.cpp @@ -39,33 +39,30 @@ ** ****************************************************************************/ #include "testtypes.h" -#include <QWidget> -#include <QPlainTextEdit> #include <QQmlEngine> -#include <QScriptEngine> -static QScriptValue script_api(QQmlEngine *engine, QScriptEngine *scriptEngine) +static QJSValue script_api(QQmlEngine *engine, QJSEngine *scriptEngine) { Q_UNUSED(engine) Q_UNUSED(scriptEngine) static int testProperty = 13; - QScriptValue v = scriptEngine->newObject(); + QJSValue v = scriptEngine->newObject(); v.setProperty("scriptTestProperty", testProperty++); return v; } -static QObject *qobject_api(QQmlEngine *engine, QScriptEngine *scriptEngine) +static QObject *qobject_api(QQmlEngine *engine, QJSEngine *scriptEngine) { Q_UNUSED(engine) Q_UNUSED(scriptEngine) - testQObjectApi *o = new testQObjectApi(); + testQObjectApi *o = new testQObjectApi; o->setQObjectTestProperty(20); return o; } -static QObject *qobject_api_engine_parent(QQmlEngine *engine, QScriptEngine *scriptEngine) +static QObject *qobject_api_engine_parent(QQmlEngine *engine, QJSEngine *scriptEngine) { Q_UNUSED(scriptEngine) @@ -80,19 +77,18 @@ void registerTypes() qmlRegisterType<MyQmlObject>("Qt.test", 1,0, "MyQmlObjectAlias"); qmlRegisterType<MyQmlObject>("Qt.test", 1,0, "MyQmlObject"); - qmlRegisterType<QPlainTextEdit>("Qt.test",1,0,"QPlainTextEdit"); qRegisterMetaType<MyQmlObject::MyType>("MyQmlObject::MyType"); qmlRegisterType<ScarceResourceProvider>("Qt.test", 1,0, "MyScarceResourceProvider"); qmlRegisterType<ArbitraryVariantProvider>("Qt.test", 1,0, "MyArbitraryVariantProvider"); qmlRegisterModuleApi("Qt.test",1,0,script_api); // register (script) module API for an existing uri which contains elements - qmlRegisterModuleApi("Qt.test",1,0,qobject_api); // register (qobject) for an existing uri for which another module API was previously regd. Should replace! + qmlRegisterModuleApi<testQObjectApi>("Qt.test",1,0,qobject_api); // register (qobject) for an existing uri for which another module API was previously regd. Should replace! qmlRegisterModuleApi("Qt.test.scriptApi",1,0,script_api); // register (script) module API for a uri which doesn't contain elements - qmlRegisterModuleApi("Qt.test.qobjectApi",1,0,qobject_api); // register (qobject) module API for a uri which doesn't contain elements - qmlRegisterModuleApi("Qt.test.qobjectApi",1,3,qobject_api); // register (qobject) module API for a uri which doesn't contain elements, minor version set - qmlRegisterModuleApi("Qt.test.qobjectApi",2,0,qobject_api); // register (qobject) module API for a uri which doesn't contain elements, major version set - qmlRegisterModuleApi("Qt.test.qobjectApiParented",1,0,qobject_api_engine_parent); // register (parented qobject) module API for a uri which doesn't contain elements + qmlRegisterModuleApi<testQObjectApi>("Qt.test.qobjectApi",1,0,qobject_api); // register (qobject) module API for a uri which doesn't contain elements + qmlRegisterModuleApi<testQObjectApi>("Qt.test.qobjectApi",1,3,qobject_api); // register (qobject) module API for a uri which doesn't contain elements, minor version set + qmlRegisterModuleApi<testQObjectApi>("Qt.test.qobjectApi",2,0,qobject_api); // register (qobject) module API for a uri which doesn't contain elements, major version set + qmlRegisterModuleApi<testQObjectApi>("Qt.test.qobjectApiParented",1,0,qobject_api_engine_parent); // register (parented qobject) module API for a uri which doesn't contain elements } //#include "testtypes.moc" diff --git a/tests/benchmarks/qml/holistic/testtypes.h b/tests/benchmarks/qml/holistic/testtypes.h index 66d755d944..85885cf9e4 100644 --- a/tests/benchmarks/qml/holistic/testtypes.h +++ b/tests/benchmarks/qml/holistic/testtypes.h @@ -53,7 +53,7 @@ #include <QtGui/qpixmap.h> #include <QtGui/qvector3d.h> #include <QtCore/qdatetime.h> -#include <QtScript/qjsvalue.h> +#include <QtQml/qjsvalue.h> #include <QtQml/qqmlscriptstring.h> #include <QtQml/qqmlcomponent.h> |