2 files changed, 12 insertions, 11 deletions
diff --git a/src/quickcontrols2/material/qquickmaterialstyle.cpp b/src/quickcontrols2/material/qquickmaterialstyle.cpp
index b4c782f023..9114462828 100644
--- a/src/quickcontrols2/material/qquickmaterialstyle.cpp
+++ b/src/quickcontrols2/material/qquickmaterialstyle.cpp
@@ -399,7 +399,7 @@ static QQuickMaterialStyle::Theme effectiveTheme(QQuickMaterialStyle::Theme them
     return theme;
 }
 
-QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickAttachedObject(parent),
+QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickAttachedPropertyPropagator(parent),
     m_customPrimary(globalPrimaryCustom),
     m_customAccent(globalAccentCustom),
     m_customForeground(globalForegroundCustom),
@@ -412,7 +412,7 @@ QQuickMaterialStyle::QQuickMaterialStyle(QObject *parent) : QQuickAttachedObject
     m_foreground(globalForeground),
     m_background(globalBackground)
 {
-    QQuickAttachedObject::init();
+    QQuickAttachedPropertyPropagator::initialize();
 }
 
 QQuickMaterialStyle *QQuickMaterialStyle::qmlAttachedProperties(QObject *object)
@@ -464,7 +464,7 @@ void QQuickMaterialStyle::inheritTheme(Theme theme)
 void QQuickMaterialStyle::propagateTheme()
 {
     const auto styles = attachedChildren();
-    for (QQuickAttachedObject *child : styles) {
+    for (QQuickAttachedPropertyPropagator *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritTheme(m_theme);
@@ -530,7 +530,7 @@ void QQuickMaterialStyle::inheritPrimary(uint primary, bool custom)
 void QQuickMaterialStyle::propagatePrimary()
 {
     const auto styles = attachedChildren();
-    for (QQuickAttachedObject *child : styles) {
+    for (QQuickAttachedPropertyPropagator *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritPrimary(m_primary, m_customPrimary);
@@ -594,7 +594,7 @@ void QQuickMaterialStyle::inheritAccent(uint accent, bool custom)
 void QQuickMaterialStyle::propagateAccent()
 {
     const auto styles = attachedChildren();
-    for (QQuickAttachedObject *child : styles) {
+    for (QQuickAttachedPropertyPropagator *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritAccent(m_accent, m_customAccent);
@@ -666,7 +666,7 @@ void QQuickMaterialStyle::inheritForeground(uint foreground, bool custom, bool h
 void QQuickMaterialStyle::propagateForeground()
 {
     const auto styles = attachedChildren();
-    for (QQuickAttachedObject *child : styles) {
+    for (QQuickAttachedPropertyPropagator *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritForeground(m_foreground, m_customForeground, m_hasForeground);
@@ -731,7 +731,7 @@ void QQuickMaterialStyle::inheritBackground(uint background, bool custom, bool h
 void QQuickMaterialStyle::propagateBackground()
 {
     const auto styles = attachedChildren();
-    for (QQuickAttachedObject *child : styles) {
+    for (QQuickAttachedPropertyPropagator *child : styles) {
         QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(child);
         if (material)
             material->inheritBackground(m_background, m_customBackground, m_hasBackground);
@@ -1319,7 +1319,7 @@ void QQuickMaterialStyle::initGlobals()
     }
 }
 
-void QQuickMaterialStyle::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent)
+void QQuickMaterialStyle::attachedParentChange(QQuickAttachedPropertyPropagator *newParent, QQuickAttachedPropertyPropagator *oldParent)
 {
     Q_UNUSED(oldParent);
     QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(newParent);
diff --git a/src/quickcontrols2/material/qquickmaterialstyle_p.h b/src/quickcontrols2/material/qquickmaterialstyle_p.h
index 5c009b124b..99344a6192 100644
--- a/src/quickcontrols2/material/qquickmaterialstyle_p.h
+++ b/src/quickcontrols2/material/qquickmaterialstyle_p.h
@@ -16,11 +16,12 @@
 //
 
 #include <QtGui/qcolor.h>
-#include <QtQuickControls2Impl/private/qquickattachedobject_p.h>
+#include <QtQml/qqml.h>
+#include <QtQuickControls2/qquickattachedpropertypropagator.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickMaterialStyle : public QQuickAttachedObject
+class QQuickMaterialStyle : public QQuickAttachedPropertyPropagator
 {
     Q_OBJECT
     Q_PROPERTY(Theme theme READ theme WRITE setTheme RESET resetTheme NOTIFY themeChanged FINAL)
@@ -256,7 +257,7 @@ Q_SIGNALS:
     void toolTextColorChanged();
 
 protected:
-    void attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent) override;
+    void attachedParentChange(QQuickAttachedPropertyPropagator *newParent, QQuickAttachedPropertyPropagator *oldParent) override;
 
 private:
     void init();