aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-10-03 09:00:08 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-03 17:48:34 +0200
commit558d7c2b798ad72c217a79a5b9d300877ec12363 (patch)
tree0dfe7cdd43a2810fbcd187443675ce13475990db /src/quick/items
parent4ce2c0310c55c78b783b79c1f3fa2e0aa40fe6a2 (diff)
Make transform and opacity animators work when layer.enabled: true
Change-Id: I6d9ece93a75782d524c211fc81a43f4311a38571 Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'src/quick/items')
-rw-r--r--src/quick/items/qquickitem_p.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h
index b80bb36a06..b1e63e6535 100644
--- a/src/quick/items/qquickitem_p.h
+++ b/src/quick/items/qquickitem_p.h
@@ -209,6 +209,9 @@ Q_SIGNALS:
void sourceRectChanged(const QRectF &sourceRect);
private:
+ friend class QQuickTransformAnimatorJob;
+ friend class QQuickOpacityAnimatorJob;
+
void activate();
void deactivate();
void activateEffect();