Merge dev into 5.14

Change-Id: I3ae119563f41fda63ac2b452f2d05fa83e411faa

2 files changed, 4 insertions, 2 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();
     }
 }
diff --git a/src/qml/types/qqmlconnections_p.h b/src/qml/types/qqmlconnections_p.h
index 1acc86239f..5d28e8e8be 100644
--- a/src/qml/types/qqmlconnections_p.h
+++ b/src/qml/types/qqmlconnections_p.h
@@ -69,7 +69,7 @@ class Q_AUTOTEST_EXPORT QQmlConnections : public QObject, public QQmlParserStatu
 
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
-    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged REVISION 1)
+    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged REVISION 3)
     Q_PROPERTY(bool ignoreUnknownSignals READ ignoreUnknownSignals WRITE setIgnoreUnknownSignals)
 
 public:
@@ -87,7 +87,7 @@ public:
 
 Q_SIGNALS:
     void targetChanged();
-    Q_REVISION(1) void enabledChanged();
+    Q_REVISION(3) void enabledChanged();
 
 private:
     void connectSignals();