3 files changed, 14 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h
index f96e7358a2..920105ee9e 100644
--- a/src/corelib/kernel/qcore_mac_p.h
+++ b/src/corelib/kernel/qcore_mac_p.h
@@ -90,7 +90,7 @@ public:
     QAppleRefCounted(const QAppleRefCounted &other) : value(other.value) { if (value) RetainFunction(value); }
     ~QAppleRefCounted() { if (value) ReleaseFunction(value); }
     operator T() const { return value; }
-    void swap(QAppleRefCounted &other) Q_DECL_NOEXCEPT_EXPR(noexcept(qSwap(value, other.value)))
+    void swap(QAppleRefCounted &other) noexcept(noexcept(qSwap(value, other.value)))
     { qSwap(value, other.value); }
     QAppleRefCounted &operator=(const QAppleRefCounted &other)
     { QAppleRefCounted copy(other); swap(copy); return *this; }
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 27f76042d2..3bcad8cf32 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -3017,6 +3017,18 @@ int QMetaProperty::propertyIndex() const
 }
 
 /*!
+  \since 5.14
+
+  Returns this property's index relative within the enclosing meta object.
+*/
+int QMetaProperty::relativePropertyIndex() const
+{
+    if (!mobj)
+        return -1;
+    return idx;
+}
+
+/*!
     Returns \c true if the property's type is an enumeration value that
     is used as a flag; otherwise returns \c false.
 
diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h
index 51ace3d5f7..6c5f78d208 100644
--- a/src/corelib/kernel/qmetaobject.h
+++ b/src/corelib/kernel/qmetaobject.h
@@ -253,6 +253,7 @@ public:
     QVariant::Type type() const;
     int userType() const;
     int propertyIndex() const;
+    int relativePropertyIndex() const;
 
     bool isReadable() const;
     bool isWritable() const;