diff options
| -rw-r--r-- | src/qml/qml/qqml.h | 42 | ||||
| -rw-r--r-- | tests/auto/qml/qqmllanguage/testtypes.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp | 2 |
3 files changed, 2 insertions, 44 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index 0d474d6c4e..d346660987 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -190,14 +190,6 @@ int qmlRegisterAnonymousType(const char *uri, int versionMajor) return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type); } -#if QT_DEPRECATED_SINCE(5, 14) -template<typename T> -QT_DEPRECATED_VERSION_X_5_14("Use qmlRegisterAnonymousType instead") int qmlRegisterType() -{ - return qmlRegisterAnonymousType<T>("", 1); -} -#endif - int Q_QML_EXPORT qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& message); @@ -451,15 +443,6 @@ int qmlRegisterExtendedType(const char *uri, int versionMajor) return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type); } -#if QT_DEPRECATED_SINCE(5, 15) -template<typename T, typename E> -QT_DEPRECATED_VERSION_X_5_15("Use qmlRegisterExtendedType(uri, versionMajor) instead") -int qmlRegisterExtendedType() -{ - return qmlRegisterExtendedType<T, E>("", 0); -} -#endif - template<typename T, typename E> int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor, const char *qmlName) @@ -496,31 +479,6 @@ int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor, return QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type); } -#if QT_DEPRECATED_SINCE(5, 15) -template<typename T> -QT_DEPRECATED_VERSION_X_5_15("Use qmlRegisterInterface(uri, versionMajor) instead") -int qmlRegisterInterface(const char *typeName) -{ - QByteArray name(typeName); - - QByteArray pointerName(name + '*'); - QByteArray listName("QQmlListProperty<" + name + '>'); - - QQmlPrivate::RegisterInterface qmlInterface = { - 0, - - QMetaType::fromType<T *>(), - QMetaType::fromType<QQmlListProperty<T> >(), - - qobject_interface_iid<T *>(), - "", - QTypeRevision::zero() - }; - - return QQmlPrivate::qmlregister(QQmlPrivate::InterfaceRegistration, &qmlInterface); -} -#endif - template<typename T> int qmlRegisterInterface(const char *uri, int versionMajor) { diff --git a/tests/auto/qml/qqmllanguage/testtypes.cpp b/tests/auto/qml/qqmllanguage/testtypes.cpp index c3272d0031..80ec4900c7 100644 --- a/tests/auto/qml/qqmllanguage/testtypes.cpp +++ b/tests/auto/qml/qqmllanguage/testtypes.cpp @@ -47,7 +47,7 @@ static QJSValue myQJSValueQObjectSingleton(QQmlEngine *engine, QJSEngine *script void registerTypes() { - qmlRegisterInterface<MyInterface>("MyInterface"); + qmlRegisterInterface<MyInterface>("MyInterface", 1); qmlRegisterType<MyQmlObject>("Test",1,0,"MyQmlObject"); qmlRegisterType<MyTypeObject>("Test",1,0,"MyTypeObject"); qmlRegisterType<MyContainer>("Test",1,0,"MyContainer"); diff --git a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp index 4523cd029e..12c6ef89aa 100644 --- a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp +++ b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp @@ -2146,7 +2146,7 @@ void tst_qqmlproperty::nullPropertyBinding() void tst_qqmlproperty::interfaceBinding() { - qmlRegisterInterface<Interface>("Interface"); + qmlRegisterInterface<Interface>("Interface", 1); qmlRegisterType<A>("io.qt.bugreports", 1, 0, "A"); qmlRegisterType<B>("io.qt.bugreports", 1, 0, "B"); qmlRegisterType<C>("io.qt.bugreports", 1, 0, "C"); |