diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-08-27 07:50:48 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-08-27 07:50:48 +0300 |
| commit | 3fbaa2618c0c43a4dd6550666a789327f0d8f2cc (patch) | |
| tree | dc48f088144a44e2026f196ad14add4519d4d30a /src/qml/types/qqmlconnections.cpp | |
| parent | 7919751e999d68d4b4e9dae37493d607e7759105 (diff) | |
| parent | 50ccfaa7ad26e0872ac50b92b346bebbd3002838 (diff) | |
Merge dev into 5.14
Change-Id: I3ae119563f41fda63ac2b452f2d05fa83e411faa
Diffstat (limited to 'src/qml/types/qqmlconnections.cpp')
| -rw-r--r-- | src/qml/types/qqmlconnections.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/types/qqmlconnections.cpp b/src/qml/types/qqmlconnections.cpp index f9188b1bb5..1e801641e5 100644 --- a/src/qml/types/qqmlconnections.cpp +++ b/src/qml/types/qqmlconnections.cpp @@ -274,8 +274,10 @@ void QQmlConnections::connectSignals() if (d->bindings.isEmpty()) { connectSignalsToMethods(); } else { +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) qmlWarning(this) << tr("Implicitly defined onFoo properties in Connections are deprecated. " "Use this syntax instead: function onFoo(<arguments>) { ... }"); +#endif connectSignalsToBindings(); } } |