aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/sizes/Sizes.cpp
diff options
context:
space:
mode:
authorRobert Griebl <[email protected]>2023-06-27 16:37:45 +0200
committerRobert Griebl <[email protected]>2023-06-27 14:51:12 +0000
commit995eb2c822b82eba8849fcd6dc7de465a7ca72f3 (patch)
treed7e6f4936c70284038ba93f21d37da9ed2d99698 /plugins/sizes/Sizes.cpp
parent7f3bda0bdc9c4c1c704fbcf8585e3470f9f9e9f5 (diff)
Add support for Qt 6.5HEADdev
Change-Id: I5dd88d1f01b77b833f8d141ea689f7647ea420c7 Reviewed-by: Dominik Holland <[email protected]>
Diffstat (limited to 'plugins/sizes/Sizes.cpp')
-rw-r--r--plugins/sizes/Sizes.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/plugins/sizes/Sizes.cpp b/plugins/sizes/Sizes.cpp
index 3a646b2b..d6fbc4b5 100644
--- a/plugins/sizes/Sizes.cpp
+++ b/plugins/sizes/Sizes.cpp
@@ -35,9 +35,6 @@
#include <QtGui/QGuiApplication>
#include <QQmlEngine>
-#include <QtQuickControls2/private/qquickstyle_p.h>
-
-
class StyleData {
public:
@@ -80,10 +77,10 @@ public:
static StyleData GlobalStyleData;
Sizes::Sizes(QObject *parent)
- : QQuickAttachedObject(parent)
+ : QQuickAttachedPropertyPropagator(parent)
, m_data(new StyleData(GlobalStyleData))
{
- init();
+ initialize();
}
Sizes::~Sizes()
@@ -130,13 +127,13 @@ int Sizes::fontSizeXXL() const
return qRound(m_data->fontSizeXXL * m_data->scale);
}
-void Sizes::init()
+void Sizes::initialize()
{
m_data.reset(new StyleData(GlobalStyleData));
- QQuickAttachedObject::init();
+ QQuickAttachedPropertyPropagator::initialize();
}
-void Sizes::attachedParentChange(QQuickAttachedObject *newParent, QQuickAttachedObject *oldParent)
+void Sizes::attachedParentChange(QQuickAttachedPropertyPropagator *newParent, QQuickAttachedPropertyPropagator *oldParent)
{
Q_UNUSED(oldParent)
Sizes* neptune = qobject_cast<Sizes *>(newParent);
@@ -181,7 +178,7 @@ void Sizes::setScale(qreal value)
void Sizes::propagateScale()
{
- for (QQuickAttachedObject *child : attachedChildren()) {
+ for (QQuickAttachedPropertyPropagator *child : attachedChildren()) {
Sizes* neptune = qobject_cast<Sizes *>(child);
if (neptune && !qFuzzyCompare(neptune->scale(), m_data->scale))
neptune->setScale(m_data->scale);