From 05108af874319f125785f9b0bfd991d6987c7abd Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@nokia.com>
Date: Thu, 11 Feb 2010 17:59:09 +0100
Subject: [PATCH] Move the change notifiers in the property editor to the
protected section
---
.../components/propertyeditor/propertyeditor.cpp | 1 +
.../qmldesigner/components/propertyeditor/propertyeditor.h | 7 ++++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index f92426dac54..ab52f4e3c8b 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -291,6 +291,7 @@ void PropertyEditor::anyPropertyChanged(const QmlObjectNode &fxObjectNode)
void PropertyEditor::otherPropertyChanged(const QmlObjectNode &fxObjectNode)
{
QmlModelView::transformChanged(fxObjectNode);
+
anyPropertyChanged(fxObjectNode);
}
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
index 0026f509b41..9fff376df6d 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.h
@@ -81,13 +81,11 @@ public:
ModelState modelState() const;
- void otherPropertyChanged(const QmlObjectNode &);
- void transformChanged(const QmlObjectNode &qmlObjectNode);
+
void anyPropertyChanged(const QmlObjectNode &qmlObjectNode);
- void stateChanged(const QmlModelState &newQmlModelState, const QmlModelState &oldQmlModelState);
void propertiesAboutToBeRemoved(const QList<AbstractProperty>& propertyList);
void variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange);
@@ -97,6 +95,9 @@ public:
protected:
void timerEvent(QTimerEvent *event);
+ void otherPropertyChanged(const QmlObjectNode &);
+ void transformChanged(const QmlObjectNode &qmlObjectNode);
+ void stateChanged(const QmlModelState &newQmlModelState, const QmlModelState &oldQmlModelState);
private slots:
void reloadQml();
--
GitLab