From a6eb09137247a880c58995464a35c1ad5c3f0c20 Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Tue, 17 Jan 2012 16:49:13 +0100 Subject: Fixed some Item.layer bugs and added auto-tests. Change-Id: I3f66f911d1c499c37a66904f8ddab6951ba85e60 Reviewed-by: Gunnar Sletta --- src/quick/items/qquickitem_p.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/quick/items/qquickitem_p.h') diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 08cdd5700f..2383ae11ee 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -157,7 +157,7 @@ public: void classBegin(); void componentComplete(); - bool enabled() const { return m_effectSource != 0; } + bool enabled() const { return m_enabled; } void setEnabled(bool enabled); bool mipmap() const { return m_mipmap; } @@ -179,12 +179,7 @@ public: void setWrapMode(QQuickShaderEffectSource::WrapMode mode); QString name() const { return m_name; } - void setName(const QString &name) { - if (m_name == name) - return; - m_name = name; - emit nameChanged(name); - } + void setName(const QString &name); QDeclarativeComponent *effect() const { return m_effectComponent; } void setEffect(QDeclarativeComponent *effect); @@ -216,6 +211,8 @@ signals: private: void activate(); void deactivate(); + void activateEffect(); + void deactivateEffect(); QQuickItem *m_item; bool m_enabled; -- cgit v1.2.3