diff options
Diffstat (limited to 'src/qml/types')
| -rw-r--r-- | src/qml/types/qqmlbind.cpp | 4 | ||||
| -rw-r--r-- | src/qml/types/qqmlbind_p.h | 1 | ||||
| -rw-r--r-- | src/qml/types/qqmlconnections_p.h | 8 | ||||
| -rw-r--r-- | src/qml/types/qqmltimer_p.h | 1 |
4 files changed, 12 insertions, 2 deletions
diff --git a/src/qml/types/qqmlbind.cpp b/src/qml/types/qqmlbind.cpp index 02c3b71806..6d6553259e 100644 --- a/src/qml/types/qqmlbind.cpp +++ b/src/qml/types/qqmlbind.cpp @@ -486,7 +486,7 @@ void QQmlBind::eval() qmlWarning(this) << "Not restoring previous value because restoreMode has not been set.\n" << "This behavior is deprecated.\n" - << "You have to import QtQml 2.14 after any QtQuick imports and set\n" + << "You have to import QtQml 2.15 after any QtQuick imports and set\n" << "the restoreMode of the binding to fix this warning.\n" << "In Qt < 6.0 the default is Binding.RestoreBinding.\n" << "In Qt >= 6.0 the default is Binding.RestoreBindingOrValue."; @@ -499,7 +499,7 @@ void QQmlBind::eval() qmlWarning(this) << "Not restoring previous value because restoreMode has not been set.\n" << "This behavior is deprecated.\n" - << "You have to import QtQml 2.14 after any QtQuick imports and set\n" + << "You have to import QtQml 2.15 after any QtQuick imports and set\n" << "the restoreMode of the binding to fix this warning.\n" << "In Qt < 6.0 the default is Binding.RestoreBinding.\n" << "In Qt >= 6.0 the default is Binding.RestoreBindingOrValue.\n"; diff --git a/src/qml/types/qqmlbind_p.h b/src/qml/types/qqmlbind_p.h index 7bf4fc4dfd..c709224c23 100644 --- a/src/qml/types/qqmlbind_p.h +++ b/src/qml/types/qqmlbind_p.h @@ -81,6 +81,7 @@ private: Q_PROPERTY(RestorationMode restoreMode READ restoreMode WRITE setRestoreMode NOTIFY restoreModeChanged REVISION 14) Q_ENUM(RestorationMode) + QML_NAMED_ELEMENT(Binding) public: QQmlBind(QObject *parent=nullptr); diff --git a/src/qml/types/qqmlconnections_p.h b/src/qml/types/qqmlconnections_p.h index 5d28e8e8be..7bf688cf75 100644 --- a/src/qml/types/qqmlconnections_p.h +++ b/src/qml/types/qqmlconnections_p.h @@ -71,6 +71,7 @@ class Q_AUTOTEST_EXPORT QQmlConnections : public QObject, public QQmlParserStatu Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged) Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged REVISION 3) Q_PROPERTY(bool ignoreUnknownSignals READ ignoreUnknownSignals WRITE setIgnoreUnknownSignals) + QML_NAMED_ELEMENT(Connections) public: QQmlConnections(QObject *parent=nullptr); @@ -106,6 +107,13 @@ public: void applyBindings(QObject *object, const QQmlRefPointer<QV4::ExecutableCompilationUnit> &compilationUnit, const QList<const QV4::CompiledData::Binding *> &bindings) override; }; +// TODO: We won't need Connections to be a custom type anymore once we can drop the +// automatic signal handler inference from undeclared properties. +template<> +inline QQmlCustomParser *qmlCreateCustomParser<QQmlConnections>() +{ + return new QQmlConnectionsParser; +} QT_END_NAMESPACE diff --git a/src/qml/types/qqmltimer_p.h b/src/qml/types/qqmltimer_p.h index 0160e97a2f..0cd93e4659 100644 --- a/src/qml/types/qqmltimer_p.h +++ b/src/qml/types/qqmltimer_p.h @@ -72,6 +72,7 @@ class Q_QML_PRIVATE_EXPORT QQmlTimer : public QObject, public QQmlParserStatus Q_PROPERTY(bool repeat READ isRepeating WRITE setRepeating NOTIFY repeatChanged) Q_PROPERTY(bool triggeredOnStart READ triggeredOnStart WRITE setTriggeredOnStart NOTIFY triggeredOnStartChanged) Q_PROPERTY(QObject *parent READ parent CONSTANT) + QML_NAMED_ELEMENT(Timer) public: QQmlTimer(QObject *parent=nullptr); |